From 20601305ec1fe7f09f659d141e9a4afd93a2971b Mon Sep 17 00:00:00 2001
From: Michael Biarnes Kiefer <mbiarnes@redhat.com>
Date: Fri, 1 Aug 2025 17:06:57 +0200
Subject: [PATCH] upgrade microshift-bootc to rhel 9.6

(cherry picked from commit 1cea14c3dc7157fc3284dc860d94012df95d9bd5)
(cherry picked from commit 5db1daeb567ea0e9b532e026a16cc1ecd2bf9551)
---
 group.yml                           | 44 +++++++++++++++++++++++++++++
 images/microshift-bootc.yml         |  8 +++---
 images/ose-must-gather-operator.yml |  0
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 images/ose-must-gather-operator.yml

diff --git a/group.yml b/group.yml
index 61020c5b43..16942c83e4 100644
--- a/group.yml
+++ b/group.yml
@@ -360,6 +360,28 @@ repos:
     reposync:
       enabled: false
 
+  rhel-96-baseos-rpms:
+    conf:
+      extra_options:
+        module_hotfixes: 1
+      baseurl:
+        aarch64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/aarch64/baseos/os/"
+        ppc64le: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/ppc64le/baseos/os/"
+        s390x: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/s390x/baseos/os/"
+        x86_64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/x86_64/baseos/os/"
+      ci_alignment:
+        profiles:
+        - el9
+        localdev:
+          enabled: true
+    content_set:
+      default: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_6
+      aarch64: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_6
+      ppc64le: rhel-9-for-ppc64le-baseos-eus-rpms__9_DOT_6
+      s390x: rhel-9-for-s390x-baseos-eus-rpms__9_DOT_6
+    reposync:
+      enabled: false
+
   rhel-9-appstream-rpms:
     conf:
       extra_options:
@@ -382,6 +404,28 @@ repos:
     reposync:
       enabled: false
 
+  rhel-96-appstream-rpms:
+    conf:
+      extra_options:
+        module_hotfixes: 1
+      baseurl:
+        aarch64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/aarch64/appstream/os/"
+        ppc64le: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/ppc64le/appstream/os/"
+        s390x: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/s390x/appstream/os/"
+        x86_64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/x86_64/appstream/os/"
+      ci_alignment:
+        profiles:
+        - el9
+        localdev:
+          enabled: true
+    content_set:
+      default: rhel-9-for-x86_64-appstream-eus-rpms__9_DOT_6
+      aarch64: rhel-9-for-aarch64-appstream-eus-rpms__9_DOT_6
+      ppc64le: rhel-9-for-ppc64le-appstream-eus-rpms__9_DOT_6
+      s390x: rhel-9-for-s390x-appstream-eus-rpms__9_DOT_6
+    reposync:
+      enabled: false
+
   rhel-9-server-ose-rpms-embargoed:
     conf:
       extra_options:
diff --git a/images/microshift-bootc.yml b/images/microshift-bootc.yml
index d2485d6e8b..8d4bd8835b 100644
--- a/images/microshift-bootc.yml
+++ b/images/microshift-bootc.yml
@@ -9,10 +9,10 @@ content:
     modifications:
     - action: replace
       match: "ARG BASE_IMAGE_URL"
-      replacement: "ARG BASE_IMAGE_URL='registry.redhat.io/rhel9-eus/rhel-9.6-bootc'"
+      replacement: "ARG BASE_IMAGE_URL=registry.redhat.io/rhel9-eus/rhel-9.6-bootc"
     - action: replace
       match: "ARG BASE_IMAGE_TAG"
-      replacement: "ARG BASE_IMAGE_TAG='9.6'"
+      replacement: "ARG BASE_IMAGE_TAG=9.6"
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
@@ -28,8 +28,8 @@ delivery:
 for_release: false
 for_payload: false
 enabled_repos:
-- rhel-96-baseos
-- rhel-96-appstream
+- rhel-96-baseos-rpms
+- rhel-96-appstream-rpms
 - rhel-9-fast-datapath-rpms
 - rhel-9-server-microshift-rpms
 name: openshift/microshift-bootc-rhel9
diff --git a/images/ose-must-gather-operator.yml b/images/ose-must-gather-operator.yml
new file mode 100644
index 0000000000..e69de29bb2