From 21540dd6c093166d131b148bfdf313de17d8be0f Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Mon, 27 Jan 2025 13:26:11 -0500
Subject: [PATCH] ci(runner): use arm runner images instead of qemu

---
 .github/workflows/push-ci.yaml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml
index 91d49a69b..bf17d934b 100644
--- a/.github/workflows/push-ci.yaml
+++ b/.github/workflows/push-ci.yaml
@@ -22,8 +22,8 @@ env:
 
 jobs:
   get-pom-properties:
-    runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'cryostatio' }}
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -39,25 +39,25 @@ jobs:
       image-version: ${{ steps.query-pom.outputs.image-version }}
 
   build-images:
-    runs-on: ubuntu-latest
+    name: Build images
     needs: [get-pom-properties]
     strategy:
       matrix:
         arch: [amd64, arm64]
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
     env:
       IMAGE_VERSION: ${{ needs.get-pom-properties.outputs.image-version }}
       frontend-cache-name: cache-yarn
-    name: Build images
     permissions:
       packages: write
       contents: read
     steps:
     - name: Add CRIU PPA
       run: sudo add-apt-repository ppa:criu/ppa && sudo apt update
-    - name: Install podman 4 and qemu
+    - name: Install podman 4
       run: |
         sudo apt update
-        sudo apt -y satisfy "podman (>= 4.0), qemu-user-static"
+        sudo apt -y satisfy "podman (>= 4.0)"
     - uses: actions/checkout@v4
       with:
         submodules: true
@@ -112,16 +112,16 @@ jobs:
 
   unit-test:
     name: Run unit tests
-    runs-on: ubuntu-latest
     needs: [get-pom-properties]
     strategy:
       matrix:
         arch: [amd64, arm64]
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
     steps:
-    - name: Install podman 4 and qemu
+    - name: Install podman 4
       run: |
         sudo apt update
-        sudo apt -y satisfy "podman (>= 4.0), qemu-user-static"
+        sudo apt -y satisfy "podman (>= 4.0)"
     - uses: actions/checkout@v4
       with:
         submodules: true
@@ -159,11 +159,11 @@ jobs:
 
   integration-test:
     name: Run integration tests
-    runs-on: ubuntu-latest
     needs: [build-images]
     strategy:
       matrix:
         arch: [amd64, arm64]
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
     env:
       CI_ARCH: ${{ matrix.arch }}
     steps:
@@ -171,10 +171,6 @@ jobs:
       with:
         submodules: true
         fetch-depth: 0
-    - name: Install qemu
-      run: |
-        sudo apt update
-        sudo apt -y satisfy "qemu-user-static"
     - uses: actions/setup-java@v4
       with:
         java-version: '21'
@@ -207,15 +203,15 @@ jobs:
       run: cat target/quarkus.log
 
   publish-manifest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [get-pom-properties, build-images, unit-test, integration-test]
     steps:
     - name: Add CRIU PPA
       run: sudo add-apt-repository ppa:criu/ppa && sudo apt update
-    - name: Install podman 4 and qemu
+    - name: Install podman 4
       run: |
         sudo apt update
-        sudo apt -y satisfy "podman (>= 4.0), qemu-user-static"
+        sudo apt -y satisfy "podman (>= 4.0)"
     - name: Download container tarballs
       uses: actions/download-artifact@v4
       with: