Merge pull request #5470 from ggiguash/disable-rhel94

openshift-merge-bot[bot] · web-flow · commit 4aede49c0b8f · 2025-09-15T17:49:19.000Z
USHIFT-6084: Disable rhel94 images and scenarios
diff --git a/test/bin/build_images.sh b/test/bin/build_images.sh
@@ -124,7 +124,7 @@ get_blueprint_name() {
 # rhel92-microshift-source -> rhel-9.2
 #
 # The function also supports an explicit parent override directive in the
-# blueprint in the following format: '# parent = rhel-9.4-microshift-4.17'.
+# blueprint in the following format: '# parent = rhel-9.6-microshift-4.17'.
 # Note that the directive must be commented out in the blueprint to avoid
 # composer syntax errors.
 #
diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
@@ -18,7 +18,7 @@ source "${SCRIPTDIR}/common_versions.sh"
 # shellcheck source=test/bin/scenario_container.sh
 source "${SCRIPTDIR}/scenario_container.sh"
 
-DEFAULT_BOOT_BLUEPRINT="rhel-9.4"
+DEFAULT_BOOT_BLUEPRINT="rhel-9.6"
 LVM_SYSROOT_SIZE="15360"
 PULL_SECRET="${PULL_SECRET:-${HOME}/.pull-secret.json}"
 PULL_SECRET_CONTENT="$(jq -c . "${PULL_SECRET}")"
diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-y2-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-y2-with-optional.containerfile
@@ -1,6 +1,6 @@
 # {{- if env.Getenv "BREW_Y2_RELEASE_VERSION" "" -}}
 # Note: This comment makes templating add a new line before the code
-FROM localhost/rhel94-test-agent:latest
+FROM localhost/rhel96-test-agent:latest
 
 # Build arguments
 ARG USHIFT_RPM_REPO_NAME=microshift-brew
diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-yminus2.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-yminus2.containerfile
@@ -1,4 +1,4 @@
-FROM localhost/rhel94-test-agent:latest
+FROM localhost/rhel96-test-agent:latest
 
 # Copy repository configuration
 COPY ./bootc-images/microshift-fast-datapath-rhel9.repo /bootc-images/microshift-rhocp-y2.repo \
diff --git a/test/image-blueprints/layer1-base/group1/rhel94.toml b/test/image-blueprints/layer1-base/group1/rhel94.toml
diff --git a/test/image-blueprints/layer1-base/group2/rhel96-brew-y2-with-optionals.toml b/test/image-blueprints/layer1-base/group2/rhel96-brew-y2-with-optionals.toml
@@ -8,12 +8,12 @@
 
 */ -}}
 
-name = "rhel-9.4-microshift-brew-optionals-4.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream"
-description = "A RHEL 9.4 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_Y2_RELEASE_VERSION }}"
+name = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream"
+description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_Y2_RELEASE_VERSION }}"
 version = "0.0.1"
 modules = []
 groups = []
-distro = "rhel-94"
+distro = "rhel-96"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer1-base/group2/rhel96-microshift-yminus2.toml b/test/image-blueprints/layer1-base/group2/rhel96-microshift-yminus2.toml
@@ -1,9 +1,9 @@
-name = "rhel-9.4-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
-description = "RHEL 9.4 with MicroShift from two minor versions back installed."
+name = "rhel-9.6-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
+description = "RHEL 9.6 with MicroShift from two minor versions back installed."
 version = "0.0.1"
 modules = []
 groups = []
-distro = "rhel-94"
+distro = "rhel-96"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer1-base/group3/rhel96-brew-y1-with-optionals.toml b/test/image-blueprints/layer1-base/group3/rhel96-brew-y1-with-optionals.toml
@@ -17,7 +17,7 @@ distro = "rhel-96"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'
-# parent = "rhel-9.4-microshift-brew-optionals-4.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream"
+# parent = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer1-base/group3/rhel96-microshift-previous-minor.toml b/test/image-blueprints/layer1-base/group3/rhel96-microshift-previous-minor.toml
@@ -7,7 +7,7 @@ distro = "rhel-96"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'
-# parent = "rhel-9.4-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer1-base/group4/rhel94.image-installer b/test/image-blueprints/layer1-base/group4/rhel94.image-installer
diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ostree2bootc-ok.sh
@@ -5,7 +5,7 @@
 scenario_create_vms() {
     # The y-2 ostree image will be fetched from the cache as it is not built
     # as part of the bootc image build procedure
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${YMINUS2_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-4.${YMINUS2_MINOR_VERSION}"
     launch_vm
 }
 
diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@el96-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-yminus2@el96-src@upgrade-ok.sh
@@ -3,8 +3,8 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template rhel94-bootc-yminus2
-    launch_vm --boot_blueprint rhel94-bootc
+    prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2
+    launch_vm --boot_blueprint rhel96-bootc
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh
@@ -3,17 +3,17 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template rhel94-bootc-yminus2
-    launch_vm --boot_blueprint rhel94-bootc
+    prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2
+    launch_vm --boot_blueprint rhel96-bootc
 }
 
 scenario_remove_vms() {
     remove_vm host1
 }
 
 scenario_run_tests() {
-    prepare_static_delta rhel94-bootc-yminus2 rhel96-bootc-prel
-    apply_static_delta   rhel94-bootc-yminus2 rhel96-bootc-prel
+    prepare_static_delta rhel96-bootc-yminus2 rhel96-bootc-prel
+    apply_static_delta   rhel96-bootc-yminus2 rhel96-bootc-prel
 
     prepare_static_delta rhel96-bootc-prel rhel96-bootc-source
     apply_static_delta   rhel96-bootc-prel rhel96-bootc-source
diff --git a/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh b/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh
@@ -13,8 +13,8 @@ scenario_create_vms() {
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
-    prepare_kickstart host1 kickstart-bootc.ks.template rhel94-bootc-brew-y2-with-optional
-    launch_vm --boot_blueprint rhel94-bootc
+    prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-brew-y2-with-optional
+    launch_vm --boot_blueprint rhel96-bootc
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh b/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh
@@ -13,8 +13,8 @@ scenario_create_vms() {
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
-    prepare_kickstart host1 kickstart-bootc.ks.template rhel94-bootc-brew-y2-with-optional
-    launch_vm --boot_blueprint rhel94-bootc
+    prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-brew-y2-with-optional
+    launch_vm --boot_blueprint rhel96-bootc
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/presubmits/el96-yminus2@el96-src@upgrade-ok.sh b/test/scenarios/presubmits/el96-yminus2@el96-src@upgrade-ok.sh
@@ -3,7 +3,7 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${YMINUS2_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-4.${YMINUS2_MINOR_VERSION}"
     launch_vm 
 }
 
diff --git a/test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh b/test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh
@@ -7,7 +7,7 @@
 export TEST_RANDOMIZATION=none
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-brew-optionals-4.${YMINUS2_MINOR_VERSION}-zstream"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${YMINUS2_MINOR_VERSION}-zstream"
     launch_vm 
 }
 
diff --git a/test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh b/test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh
@@ -7,7 +7,7 @@
 export TEST_RANDOMIZATION=none
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-brew-optionals-4.${YMINUS2_MINOR_VERSION}-zstream"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${YMINUS2_MINOR_VERSION}-zstream"
     launch_vm 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ get_blueprint_name() {`
`124`	`124`	`# rhel92-microshift-source -> rhel-9.2`
`125`	`125`	`#`
`126`	`126`	`# The function also supports an explicit parent override directive in the`
`127`		`-# blueprint in the following format: '# parent = rhel-9.4-microshift-4.17'.`
	`127`	`+# blueprint in the following format: '# parent = rhel-9.6-microshift-4.17'.`
`128`	`128`	`# Note that the directive must be commented out in the blueprint to avoid`
`129`	`129`	`# composer syntax errors.`
`130`	`130`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM localhost/rhel94-test-agent:latest`
	`1`	`+FROM localhost/rhel96-test-agent:latest`
`2`	`2`
`3`	`3`	`# Copy repository configuration`
`4`	`4`	`COPY ./bootc-images/microshift-fast-datapath-rhel9.repo /bootc-images/microshift-rhocp-y2.repo \`