From 7a3533b0489605e2a6072fd05a043f305f534bf5 Mon Sep 17 00:00:00 2001
From: Rolv Apneseth <rolv.apneseth@gmail.com>
Date: Mon, 21 Sep 2026 13:56:59 +0100
Subject: [PATCH 1/2] ci: skip running bootc-e2e on forks

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbaced1e..6bbfc38f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,7 @@ env:
 
 jobs:
   bootc-e2e:
+    if: github.repository == 'coreos/bootupd'
     strategy:
       matrix:
         runner:

From 6837359874ba1aa4db50cd3fcb5f4783daf0b1e5 Mon Sep 17 00:00:00 2001
From: Rolv Apneseth <rolv.apneseth@gmail.com>
Date: Mon, 21 Sep 2026 15:54:18 +0100
Subject: [PATCH 2/2] ci: use bootc-dev/actions/bootc-ubuntu-setup

Using this action allows some de-duplication of what we currently have,
and resolves some CI issues. Namely:

```
E: Unable to fetch some archives, maybe run apt-get update or try with
--fix-missing?
```

And when the above is fixed:

```
+ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys
6ED0E7B82643E131 78DBA3BC47EF2265
Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d
instead (see apt-key(8)).
Executing: /tmp/apt-key-gpghome.AKoZL3jqUe/gpg.1.sh --keyserver
keyserver.ubuntu.com --recv-keys 6ED0E7B82643E131 78DBA3BC47EF2265
gpg: keyserver receive failed: Connection timed out
```

Assisted by: LLM
---
 .github/workflows/ci.yml | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6bbfc38f..a9c3ab2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,22 +40,13 @@ jobs:
     runs-on: [ "${{ matrix.runner }}" ]
 
     steps:
-      - name: Install QEMU and OVMF for VM boot tests
-        if: ${{ matrix.runner == 'ubuntu-24.04' }}
-        shell: bash
-        run: |
-          set -xeuo pipefail
-          sudo apt install -y qemu-utils qemu-kvm ovmf
+      - uses: bootc-dev/actions/bootc-ubuntu-setup@fdfe1dc66edbfa03897ab619a5c037fb8f5339ff
+        with:
+          libvirt: ${{ matrix.runner == 'ubuntu-24.04' && 'true' || 'false' }}
 
-      - name: Enable unprivileged /dev/kvm access
+      - name: Install OVMF for UEFI VM boot tests
         if: ${{ matrix.runner == 'ubuntu-24.04' }}
-        shell: bash
-        run: |
-          set -xeuo pipefail
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls -l /dev/kvm
+        run: sudo apt-get install -y ovmf
 
       - name: Setup env
         run: |
@@ -71,29 +62,8 @@ jobs:
           echo "IMG_NAME=${IMG_NAME}" >> "$GITHUB_ENV"
           echo "OS_ID=${OS_ID}" >> "$GITHUB_ENV"
 
-      - name: Get a newer podman for heredoc support (from debian testing)
-        run: |
-          set -eux
-          echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6ED0E7B82643E131 78DBA3BC47EF2265
-          sudo apt update
-          DIVERSION_PATHS="lib32 libo32 lib64"
-          for PATH_NAME in $DIVERSION_PATHS; do
-            sudo dpkg-divert --remove --package base-files --divert /$PATH_NAME.usr-is-merged /$PATH_NAME || true
-            sudo dpkg-divert --remove --package base-files --divert /.$PATH_NAME.usr-is-merged /$PATH_NAME || true
-          done
-          sudo dpkg --configure -a
-          sudo apt --fix-broken install
-          sudo apt install -y crun/testing podman/testing skopeo/testing
-
       - uses: actions/checkout@v7
 
-      - name: Install podman
-        if: ( matrix.runner == 'ubuntu-24.04-arm' )
-        run: |
-          sudo apt update -y
-          sudo apt install -y podman
-
       - name: build with grubcc=${{ matrix.grubcc }}
         run: |
           if [[ "${{ matrix.grubcc }}" == "1" ]]; then