From e643ab0d05dd30f874a6334d7f878b949382426c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 7 Jul 2026 14:40:19 -0400
Subject: [PATCH 1/2] ci: Disable Debian integration tests temporarily

Something broke in debian unstable (unsurprisingly).

https://github.com/bootcrew/mono/pull/17 will add a Debian stable
variant which we should use in the future.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8f97aec..94e19dcd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,9 +121,10 @@ jobs:
           - name: centos-stream10
             base_image: quay.io/centos-bootc/centos-bootc:stream10
             cfsctl_features: pre-6.15
-          - name: debian
-            base_image: ghcr.io/bootcrew/debian-bootc:latest
-            cfsctl_features: oci
+          # Temporarily disabled
+          # - name: debian
+          #   base_image: ghcr.io/bootcrew/debian-bootc:latest
+          #   cfsctl_features: oci
     env:
       COMPOSEFS_BASE_IMAGE: ${{ matrix.base_image }}
       COMPOSEFS_CFSCTL_FEATURES: ${{ matrix.cfsctl_features }}

From afcba8579db564d58d890e51e5a51e15a0aeaef2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 7 Jul 2026 17:42:19 -0400
Subject: [PATCH 2/2] packaging: Skip already-installed packages in pkg_install

Running `dnf install -y podman` in the test container build upgraded
podman to 6.0.0 while leaving netavark at 1.17.2.

podman 6.0.0 arguably should Requires: netavark >= 2.0.0 to
prevent this mismatch; that's a separate upstream packaging bug.

Also https://gitlab.com/fedora/bootc/base-images/-/merge_requests/317
would have fixed this.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 contrib/packaging/lib.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contrib/packaging/lib.sh b/contrib/packaging/lib.sh
index 863a9aa7..d804bdcb 100644
--- a/contrib/packaging/lib.sh
+++ b/contrib/packaging/lib.sh
@@ -29,7 +29,17 @@ debian_apt_init() {
 pkg_install() {
     case "${ID}" in
         centos|fedora|rhel)
-            dnf install -y "$@"
+            # Filter out already-installed packages to avoid unintended
+            # upgrades (e.g. podman 5→6 without a matching netavark bump).
+            local -a to_install=()
+            for pkg in "$@"; do
+                if ! rpm -q "$pkg" &>/dev/null; then
+                    to_install+=("$pkg")
+                fi
+            done
+            if [ ${#to_install[@]} -gt 0 ]; then
+                dnf install -y "${to_install[@]}"
+            fi
             dnf clean all
             ;;
         debian|ubuntu)