tests: added arm runner

canonical · Sep 13, 2024 · a96ca2f · a96ca2f
1 parent 5789b81
commit a96ca2f
Showing 1 changed file with 32 additions and 11 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,9 +11,12 @@ concurrency:
 
 jobs:
   snap-builds:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
+        runner:
+          - ubuntu-22.04
+          - ubuntu-24.04-arm64
         toolchain:
           - default
           - FIPS
@@ -76,10 +79,20 @@ jobs:
           exit 1
         fi
 
+    - name: Set artifact name
+      id: set_artifact_name
+      run: |
+        postfix="${{ matrix.toolchain }}-${{ matrix.version }}"
+        if grep -q "arm" <<<"${{ matrix.runner }}"; then
+          echo "artifact_name=snap-files-arm-${postfix}" >> $GITHUB_OUTPUT
+        else
+          echo "artifact_name=snap-files-amd-${postfix}" >> $GITHUB_OUTPUT
+        fi
+
     - name: Uploading snapd snap artifact
       uses: actions/upload-artifact@v3
       with:
-        name: snap-files-${{ matrix.toolchain }}-${{ matrix.version }}
+        name: ${{ steps.set_artifact_name.outputs.artifact_name }}
         path: "*.snap"
 
   cache-build-deps:
@@ -851,6 +864,22 @@ jobs:
           # Add start line to filtered log
           echo "GRAFANA START: pr ${CHANGE_ID} attempt ${{ github.run_attempt }} run ${{ github.run_id }} group ${{ matrix.group }}" > "$FILTERED_LOG_FILE"
 
+    - name: Download built snap (amd)
+      if: "!endsWith(matrix.group, 'arm')"
+      uses: actions/download-artifact@v3
+      with:
+        name: snap-files-amd-default-test
+        pattern: snapd_1337.*.snap
+        path: "${{ github.workspace }}/built-snap"
+
+    - name: Download built snap (arm)
+      if: "endsWith(matrix.group, 'arm')"
+      uses: actions/download-artifact@v3
+      with:
+        name: snap-files-arm-default-test
+        pattern: snapd_1337.*.snap
+        path: "${{ github.workspace }}/built-snap"
+
     - name: Download built snap
       uses: actions/download-artifact@v3
       with:
@@ -878,15 +907,7 @@ jobs:
             export NESTED_ENABLE_KVM=true
           fi
 
-          case "${{ matrix.systems }}" in
-            *-arm-*)
-              SPREAD_USE_PREBUILT_SNAPD_SNAP=false
-              ;;
-            *)
-              SPREAD_USE_PREBUILT_SNAPD_SNAP=true
-              ;;
-          esac
-          export SPREAD_USE_PREBUILT_SNAPD_SNAP
+          export SPREAD_USE_PREBUILT_SNAPD_SNAP=true
 
           if [[ "${{ matrix.systems }}" =~ amazon-linux-2023 ]]; then
               # Amazon Linux 2023 has no xdelta, however we cannot disable