From edccd34049cace59ff63bd27fc311e9df205a505 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Mon, 3 Mar 2025 16:19:15 -0500
Subject: [PATCH] ci(github): re-enable qemu for single-arch testcontainers

---
 .github/workflows/pr-ci.yaml   |  6 ++++--
 .github/workflows/push-ci.yaml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
index fbd16c16a..b5cba06c7 100644
--- a/.github/workflows/pr-ci.yaml
+++ b/.github/workflows/pr-ci.yaml
@@ -130,6 +130,8 @@ jobs:
           [[registry]]
           location = "docker.io"
           blocked = true
+    - name: install qemu
+      run: dnf install -y qemu
     - run: git submodule init && git submodule update
     - name: Cache yarn packages
       uses: actions/cache@v4
@@ -155,9 +157,9 @@ jobs:
         yarn install && yarn yarn:frzinstall
         cd -
     - name: Add CRIU PPA
-      run: sudo add-apt-repository ppa:criu/ppa && sudo apt update
+      run: sudo add-apt-repository ppa:criu/ppa
     - name: Ensure podman 4+ and podman-docker installed
-      run: sudo apt update && sudo apt -y satisfy "podman (>= 4.0), podman-docker"
+      run: sudo apt update && sudo apt -y satisfy "podman (>= 4.0), podman-docker, qemu-user-static"
     - name: Start Podman API
       run: systemctl --user enable --now podman.socket
     - name: Set DOCKER_HOST environment variable
diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml
index ce83a5a3e..45effe0c8 100644
--- a/.github/workflows/push-ci.yaml
+++ b/.github/workflows/push-ci.yaml
@@ -71,11 +71,11 @@ jobs:
           location = "docker.io"
           blocked = true
     - name: Add CRIU PPA
-      run: sudo add-apt-repository ppa:criu/ppa && sudo apt update
-    - name: Install podman 4
+      run: sudo add-apt-repository ppa:criu/ppa
+    - name: Install podman 4 and qemu
       run: |
         sudo apt update
-        sudo apt -y satisfy "podman (>= 4.0)"
+        sudo apt -y satisfy "podman (>= 4.0), qemu-user-static"
     - uses: actions/checkout@v4
       with:
         submodules: true
@@ -154,10 +154,10 @@ jobs:
           [[registry]]
           location = "docker.io"
           blocked = true
-    - name: Install podman 4
+    - name: Install podman 4 and qemu
       run: |
         sudo apt update
-        sudo apt -y satisfy "podman (>= 4.0)"
+        sudo apt -y satisfy "podman (>= 4.0), qemu-user-static"
     - uses: actions/checkout@v4
       with:
         submodules: true
@@ -279,11 +279,11 @@ jobs:
           location = "docker.io"
           blocked = true
     - name: Add CRIU PPA
-      run: sudo add-apt-repository ppa:criu/ppa && sudo apt update
-    - name: Install podman 4
+      run: sudo add-apt-repository ppa:criu/ppa
+    - name: Install podman 4 and qemu
       run: |
         sudo apt update
-        sudo apt -y satisfy "podman (>= 4.0)"
+        sudo apt -y satisfy "podman (>= 4.0), qemu-user-static"
     - name: Download container tarballs
       uses: actions/download-artifact@v4
       with: