Update test runner to use podman arm self-hosted runner

Signed-off-by: Dani Llewellyn <[email protected]>
diddlesnaps · Mar 6, 2023 · 70296c0 · 70296c0
1 parent 1b0e5dc
commit 70296c0
Showing 1 changed file with 47 additions and 36 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
         npm install
         npm run all
 
-  integration: # make sure the action works on a clean machine without building
+  docker-integration: # make sure the action works on a clean machine without building
     strategy:
       matrix:
         base:
@@ -28,60 +28,26 @@ jobs:
           - armhf
           - arm64
           - ppc64el
-        usePodman:
-          - ''
-          - 'true'
-          - 'false'
         runner:
           - ubuntu-latest
         include:
           - base: core
             arch: ''
-            usePodman: 'false'
-            runner: ubuntu-20.04
-          - base: core
-            arch: ''
-            usePodman: 'true'
             runner: ubuntu-20.04
           - base: core
             arch: i386
-            usePodman: 'false'
-            runner: ubuntu-20.04
-          - base: core
-            arch: i386
-            usePodman: 'true'
             runner: ubuntu-20.04
           - base: core
             arch: amd64
-            usePodman: 'false'
-            runner: ubuntu-20.04
-          - base: core
-            arch: amd64
-            usePodman: 'true'
             runner: ubuntu-20.04
           - base: core
             arch: armhf
-            usePodman: 'false'
-            runner: ubuntu-20.04
-          - base: core
-            arch: armhf
-            usePodman: 'true'
-            runner: ubuntu-20.04
-          - base: core
-            arch: arm64
-            usePodman: 'false'
             runner: ubuntu-20.04
           - base: core
             arch: arm64
-            usePodman: 'true'
             runner: ubuntu-20.04
           - base: core18
             arch: i386
-            usePodman: 'false'
-            runner: ubuntu-latest
-          - base: core18
-            arch: i386
-            usePodman: 'true'
             runner: ubuntu-latest
     runs-on: ${{ matrix.runner }}
     steps:
@@ -92,4 +58,49 @@ jobs:
       with:
         path: './test-projects/${{ matrix.base }}'
         architecture: ${{ matrix.arch }}
-        use-podman: ${{ matrix.usePodman }}
+
+  podman-integration: # make sure the action works on a clean machine without building
+    strategy:
+      matrix:
+        base:
+          - core18
+          - core20
+          - core22
+        arch:
+          - name: ''
+            runner: ubuntu-latest
+          - name: ''
+            runner: [self-hosted, linux, ARM64]
+          - name: amd64
+            runner: ubuntu-latest
+          - name: armhf
+            runner: [self-hosted, linux, ARM64]
+          - name: arm64
+            runner: [self-hosted, linux, ARM64]
+        include:
+          - base: core
+            arch:
+              name: ''
+              runner: ubuntu-20.04
+          - base: core
+            arch:
+              name: i386
+              runner: ubuntu-20.04
+          - base: core
+            arch:
+              name: amd64
+              runner: ubuntu-20.04
+          - base: core18
+            arch:
+              name: i386
+              runner: ubuntu-latest
+    runs-on: ${{ matrix.arch.runner }}
+    steps:
+    - uses: docker/setup-qemu-action@v2
+    - uses: actions/checkout@v3
+    - uses: ./
+      id: snapcraft
+      with:
+        path: './test-projects/${{ matrix.base }}'
+        architecture: ${{ matrix.arch.name }}
+        use-podman: 'true'