openshift · kasturinarra · Sep 3, 2026
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.6-microshift-4.17'.
+# blueprint in the following format: '# parent = rhel-9.8-microshift-4.17'.
 # Note that the directive must be commented out in the blueprint to avoid
 # composer syntax errors.
 #

diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-prel.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-prel.containerfile
diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-yminus2.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-yminus2.containerfile
diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel98-bootc-yminus2.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel98-bootc-yminus2.containerfile
@@ -0,0 +1 @@
+../../../el9/layer1-base/group2/rhel98-bootc-yminus2.containerfile
diff --git a/test/image-blueprints-bootc/el9/layer1-base/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/el9/layer1-base/group1/rhel96-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-prel.containerfile b/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-prel.containerfile
diff --git a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc.image-bootc
diff --git a/...group2/rhel96-bootc-yminus2.containerfile → ...group2/rhel98-bootc-yminus2.containerfile b/...group2/rhel96-bootc-yminus2.containerfile → ...group2/rhel98-bootc-yminus2.containerfile
@@ -1,4 +1,4 @@
-FROM localhost/rhel96-test-agent:latest
+FROM localhost/rhel98-test-agent:latest
 
 # Copy repository configuration
 COPY ./bootc-images/microshift-fast-datapath-rhel9.repo /bootc-images/microshift-rhocp-y2.repo \

diff --git a/...ueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile b/...ueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
diff --git a/...ueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile b/...ueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
diff --git a/test/image-blueprints/layer1-base/group1/rhel96.toml b/test/image-blueprints/layer1-base/group1/rhel96.toml
diff --git a/...ase/group2/rhel96-microshift-yminus2.toml → ...ase/group2/rhel98-microshift-yminus2.toml b/...ase/group2/rhel96-microshift-yminus2.toml → ...ase/group2/rhel98-microshift-yminus2.toml
@@ -1,9 +1,9 @@
-name = "rhel-9.6-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}"
-description = "RHEL 9.6 with MicroShift from two minor versions back installed."
+name = "rhel-9.8-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}"
+description = "RHEL 9.8 with MicroShift from two minor versions back installed."
 version = "0.0.1"
 modules = []
 groups = []
-distro = "rhel-96"
+distro = "rhel-98"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]

diff --git a/test/image-blueprints/layer1-base/group3/rhel98-microshift-previous-minor.toml b/test/image-blueprints/layer1-base/group3/rhel98-microshift-previous-minor.toml
@@ -7,7 +7,7 @@ distro = "rhel-98"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'
-# parent = "rhel-9.6-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}"
+# parent = "rhel-9.8-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]

diff --git a/test/image-blueprints/layer1-base/group4/rhel96.image-installer b/test/image-blueprints/layer1-base/group4/rhel96.image-installer
diff --git a/test/image-blueprints/layer4-release/group1/rhel96-brew-y2-with-optionals.toml b/test/image-blueprints/layer4-release/group1/rhel96-brew-y2-with-optionals.toml
diff --git a/test/image-blueprints/layer4-release/group2/rhel96-brew-y1-with-optionals.toml b/test/image-blueprints/layer4-release/group2/rhel96-brew-y1-with-optionals.toml
diff --git a/test/image-blueprints/layer4-release/group2/rhel98-brew-y1-with-optionals.toml b/test/image-blueprints/layer4-release/group2/rhel98-brew-y1-with-optionals.toml
@@ -15,6 +15,10 @@ modules = []
 groups = []
 distro = "rhel-98"
 
+# Parent specification directive recognized by test/bin/build_images.sh to be
+# used with the '--parent' argument of 'osbuild-composer'
+# parent = "rhel-9.8-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream"
+
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
 name = "{{ . }}"

diff --git a/test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml b/test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml
@@ -17,7 +17,7 @@ distro = "rhel-98"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'
-# parent = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
+# parent = "rhel-9.8-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../el9/layer1-base/group2/rhel98-bootc-yminus2.containerfile