test armv6

AlvinSchiller · Dec 7, 2023 · 09fa6b5 · 09fa6b5
1 parent cc743c1
commit 09fa6b5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/.github/workflows/test_docker_debian_codename_sub_v3.yml b/.github/workflows/test_docker_debian_codename_sub_v3.yml
@@ -6,14 +6,14 @@ on:
         debian_codename:
           required: true
           type: string
-        docker_image_name:
-          required: false
-          type: string
-          default: rpi-jukebox-rfid-v3
         platform:
           required: false
           type: string
           default: linux/arm/v7
+        docker_image_name:
+          required: false
+          type: string
+          default: rpi-jukebox-rfid-v3
         cache_scope:
           required: false
           type: string
@@ -34,7 +34,7 @@ env:
 # let only one instance run the test so cache is not corrupted.
 # cancel already running instances as only the last run will be relevant
 concurrency:
-    group: ${{ inputs.cache_scope }}-${{ inputs.debian_codename }}
+    group: ${{ inputs.cache_scope }}-${{ inputs.debian_codename }}-${{ inputs.platform }}
     cancel-in-progress: true
 
 jobs:
@@ -73,10 +73,12 @@ jobs:
         DEBIAN_CODENAME: ${{ inputs.debian_codename }}
         DOCKER_IMAGE_NAME: ${{ inputs.docker_image_name }}
         CACHE_SCOPE: ${{ inputs.cache_scope }}
+        PLATFORM: ${{ inputs.platform }}
       run: |
-        echo "image_tag_name=${{ env.DOCKER_IMAGE_NAME }}:${{ env.DEBIAN_CODENAME }}-test" >> $GITHUB_OUTPUT
-        echo "image_file_name=${{ env.DOCKER_IMAGE_NAME }}-${{ env.DEBIAN_CODENAME }}.tar" >> $GITHUB_OUTPUT
-        echo "cache_scope=${{ env.CACHE_SCOPE }}-${{ env.DEBIAN_CODENAME }}" >> $GITHUB_OUTPUT
+        PLATFORM=${PLATFORM////_}
+        echo "image_tag_name=${{ env.DOCKER_IMAGE_NAME }}:${{ env.DEBIAN_CODENAME }}-${PLATFORM}-test" >> $GITHUB_OUTPUT
+        echo "image_file_name=${{ env.DOCKER_IMAGE_NAME }}-${{ env.DEBIAN_CODENAME }}-${PLATFORM}.tar" >> $GITHUB_OUTPUT
+        echo "cache_scope=${{ env.CACHE_SCOPE }}-${{ env.DEBIAN_CODENAME }}-${PLATFORM}" >> $GITHUB_OUTPUT
 
     - name: Set Output vars
       id: vars

diff --git a/.github/workflows/test_docker_debian_v3.yml b/.github/workflows/test_docker_debian_v3.yml
@@ -18,14 +18,30 @@ concurrency:
 jobs:
 
   # Build container and run tests. Duplication of job intended for better visualization.
-  run_bookworm:
-    name: 'bookworm'
+  run_bookworm_armv7:
+    name: 'bookworm armv7'
     uses: ./.github/workflows/test_docker_debian_codename_sub_v3.yml
     with:
       debian_codename: 'bookworm'
+      platform: linux/arm/v7
 
-  run_bullseye:
-    name: 'bullseye'
+  run_bookworm_armv6:
+    name: 'bookworm armv6'
+    uses: ./.github/workflows/test_docker_debian_codename_sub_v3.yml
+    with:
+        debian_codename: 'bookworm'
+        platform: linux/arm/v6
+
+  run_bullseye_armv7:
+    name: 'bullseye armv7'
     uses: ./.github/workflows/test_docker_debian_codename_sub_v3.yml
     with:
       debian_codename: 'bullseye'
+      platform: linux/arm/v6
+
+  run_bullseye_armv6:
+    name: 'bullseye armv6'
+    uses: ./.github/workflows/test_docker_debian_codename_sub_v3.yml
+    with:
+        debian_codename: 'bullseye'
+        platform: linux/arm/v7