The arm64 runner images sadly do not contain the same set of packages…

… as x86_64. Workaround actions/partner-runner-images#30
adelton · Feb 18, 2025 · 01f374c · 01f374c
1 parent 6cafad6
commit 01f374c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.github/actions/install-podman-arm/action.yaml b/.github/actions/install-podman-arm/action.yaml
@@ -0,0 +1,8 @@
+name: Install podman on ubuntu-24.04-arm
+runs:
+  using: composite
+  steps:
+    - run: |
+        sudo apt-get update -y
+        sudo apt-get install -y podman skopeo
+      shell: bash -euxo pipefail {0}
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -19,6 +19,7 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - name: Separate git work tree with just the files needed for build
         run: git worktree add --no-checkout ../minimize-for-build
       - name: Populate with the Dockerfile
@@ -90,6 +91,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - uses: ./.github/actions/docker-cgroups-ubuntu-22
       - uses: actions/download-artifact@v4
         with:
@@ -128,6 +130,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - run: sudo systemctl disable --now docker.service docker.socket
       - run: |
           cat <<EOT | sudo tee "/etc/apparmor.d/home.runner.bin.rootlesskit"
@@ -166,6 +169,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - uses: actions/download-artifact@v4
         with:
           name: freeipa-server-${{ matrix.os }}
@@ -196,6 +200,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - uses: actions/download-artifact@v4
         with:
           name: freeipa-server-${{ matrix.os }}
@@ -264,6 +269,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - uses: ./.github/actions/docker-cgroups-ubuntu-22
       - uses: actions/download-artifact@v4
         with:
@@ -290,6 +296,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - uses: actions/download-artifact@v4
         with:
           name: freeipa-server-${{ matrix.os }}
@@ -313,6 +320,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - uses: ./.github/actions/docker-cgroups-ubuntu-22
       - uses: actions/download-artifact@v4
         with:
@@ -358,6 +366,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-podman-arm
       - name: For RHEL builds, use entitlements
         uses: ./.github/actions/podman-entitlement
         with:

diff --git a/.github/workflows/run-partial-tests.yaml b/.github/workflows/run-partial-tests.yaml
@@ -65,7 +65,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install podman 4.*
         uses: ./.github/actions/install-podman-4
-        if: matrix.docker == 'podman' && inputs.runs-on == 'ubuntu-22.04'
+        if: matrix.docker == 'podman' && (inputs.runs-on == 'ubuntu-22.04' || inputs.runs-on == 'ubuntu-22.04-arm')
+      - uses: ./.github/actions/install-podman-arm
+        if: matrix.docker == 'podman' && inputs.runs-on == 'ubuntu-24.04-arm'
       - uses: ./.github/actions/docker-cgroups-ubuntu-22
         if: matrix.docker == 'docker'
       - name: For RHEL builds, use entitlements