From 5ab6fddb44766a69f014f4ec2f7d381e5fac0150 Mon Sep 17 00:00:00 2001
From: gursewak1997 <gursmangat@gmail.com>
Date: Tue, 15 Jul 2025 12:52:03 -0700
Subject: [PATCH] Add integration test patch back for RHEL support

---
 0000-bootc-inistall-provision.patch | 65 +++++++++++++++++++++++++++++
 bootc.spec                          |  4 ++
 2 files changed, 69 insertions(+)
 create mode 100755 0000-bootc-inistall-provision.patch

diff --git a/0000-bootc-inistall-provision.patch b/0000-bootc-inistall-provision.patch
new file mode 100755
index 0000000..e250bdf
--- /dev/null
+++ b/0000-bootc-inistall-provision.patch
@@ -0,0 +1,65 @@
+diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
+index c4c884b..29df30c 100755
+--- i/tmt/tests/bootc-install-provision.sh
++++ w/tmt/tests/bootc-install-provision.sh
+@@ -4,6 +4,8 @@ set -exuo pipefail
+ BOOTC_TEMPDIR=$(mktemp -d)
+ trap 'rm -rf -- "$BOOTC_TEMPDIR"' EXIT
+ 
++ARCH=$(uname -m)
++
+ # LBI only enabled for test-22-logically-bound-install
+ LBI="${LBI:-disabled}"
+ 
+@@ -16,6 +18,28 @@ case "$ID" in
+     "fedora")
+         TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-quay.io/fedora/fedora-bootc:${VERSION_ID}}"
+         ;;
++    "rhel")
++        TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-images.paas.redhat.com/bootc/rhel-bootc:latest-${VERSION_ID}}"
++
++        CURRENT_COMPOSE_ID=$(skopeo inspect --no-tags --retry-times=5 --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
++
++        if [[ -n ${CURRENT_COMPOSE_ID} ]]; then
++            if [[ ${CURRENT_COMPOSE_ID} == *-updates-* ]]; then
++                BATCH_COMPOSE="updates/"
++            else
++                BATCH_COMPOSE=""
++            fi
++        else
++            BATCH_COMPOSE="updates/"
++            CURRENT_COMPOSE_ID=latest-RHEL-$VERSION_ID
++        fi
++
++        # use latest compose if specific compose is not accessible
++        RC=$(curl -skIw '%{http_code}' -o /dev/null "http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/STATUS")
++        if [[ $RC != "200" ]]; then
++            CURRENT_COMPOSE_ID=latest-RHEL-${VERSION_ID%%}
++        fi
++        ;;
+ esac
+ 
+ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
+@@ -93,6 +117,22 @@ COMMONEOF
+         tee "$FEDORA_CI_CONTAINERFILE" > /dev/null << FEDORACIEOF
+ FROM $TIER1_IMAGE_URL
+ 
++RUN <<REPORUN
++tee "/etc/yum.repos.d/rhel.repo" >/dev/null <<RHELREPOEOF
++[rhel-baseos]
++name=baseos
++baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/BaseOS/${ARCH}/os/
++enabled=1
++gpgcheck=0
++
++[rhel-appstream]
++name=appstream
++baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/AppStream/${ARCH}/os/
++enabled=1
++gpgcheck=0
++RHELREPOEOF
++REPORUN
++
+ RUN dnf -y upgrade /rpms/*.rpm
+ FEDORACIEOF
+         cat >"$CONTAINERFILE" <<REALEOF
diff --git a/bootc.spec b/bootc.spec
index 156e5c0..dc52c58 100644
--- a/bootc.spec
+++ b/bootc.spec
@@ -29,6 +29,10 @@ URL:            https://github.com/containers/bootc
 Source0:        %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
 
+# Don't remove, downstream patch only
+# Patch for integration test RHEL 9.x and 10.x support
+Patch0: 0000-bootc-inistall-provision.patch
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}