Adjust cross-major versions in blueprints

pacevedom · pacevedom · commit 5db15d48ad1c · 2026-04-18T14:01:17.000+02:00
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,4 +1,4 @@
-name = "rhel-9.6-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
+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."
 version = "0.0.1"
 modules = []
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
@@ -1,4 +1,4 @@
-name = "rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+name = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 description = "RHEL 9.6 with MicroShift from the previous minor version (y-stream) installed."
 version = "0.0.1"
 modules = []
@@ -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.6-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
+# parent = "rhel-9.6-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-microshift-previous-minor.image-installer b/test/image-blueprints/layer1-base/group4/rhel96-microshift-previous-minor.image-installer
@@ -1 +1 @@
-rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}
+rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}
diff --git a/test/image-blueprints/layer1-base/group4/rhel98-crel-with-optionals.toml b/test/image-blueprints/layer1-base/group4/rhel98-crel-with-optionals.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-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer1-base/group4/rhel98-crel.toml b/test/image-blueprints/layer1-base/group4/rhel98-crel.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-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel98-source-base.toml b/test/image-blueprints/layer2-presubmit/group1/rhel98-source-base.toml
@@ -11,7 +11,7 @@ distro = "rhel-98"
 {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
 # parent = "rhel-9.8-microshift-crel"
 {{- else -}}
-# parent = "rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 {{- end -}}
 {{- "\n" -}}
 
diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel98-source-fake-next-minor.toml b/test/image-blueprints/layer2-presubmit/group1/rhel98-source-fake-next-minor.toml
@@ -11,7 +11,7 @@ distro = "rhel-98"
 {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
 # parent = "rhel-9.8-microshift-crel"
 {{- else -}}
-# parent = "rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 {{- end -}}
 {{- "\n" -}}
 
diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel98-source-with-optionals.toml b/test/image-blueprints/layer2-presubmit/group1/rhel98-source-with-optionals.toml
@@ -11,7 +11,7 @@ distro = "rhel-98"
 {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
 # parent = "rhel-9.8-microshift-crel-optionals"
 {{- else -}}
-# parent = "rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 {{- end -}}
 {{- "\n" -}}
 
diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel98-source.toml b/test/image-blueprints/layer2-presubmit/group1/rhel98-source.toml
@@ -11,7 +11,7 @@ distro = "rhel-98"
 {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
 # parent = "rhel-9.8-microshift-crel"
 {{- else -}}
-# parent = "rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}"
+# parent = "rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}"
 {{- end -}}
 {{- "\n" -}}
 
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
@@ -8,7 +8,7 @@
 
 */ -}}
 
-name = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream"
+name = "rhel-9.6-microshift-brew-optionals-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .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 = []
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
@@ -8,7 +8,7 @@
 
 */ -}}
 
-name = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
+name = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
 description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_Y1_RELEASE_VERSION }}"
 version = "0.0.1"
 modules = []
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-4.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
+# parent = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml b/test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml
@@ -8,7 +8,7 @@
 
 */ -}}
 
-name = "rhel-9.8-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-nightly"
+name = "rhel-9.8-microshift-brew-optionals-{{ .Env.MAJOR_VERSION}}.{{ .Env.MINOR_VERSION}}-nightly"
 description = "A RHEL 9.8 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_NIGHTLY_RELEASE_VERSION }}"
 version = "0.0.1"
 modules = []
@@ -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-4.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
+# parent = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream"
 
 {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }}
 [[packages]]
diff --git a/test/package-sources-bootc/microshift-rhocp-y.repo b/test/package-sources-bootc/microshift-rhocp-y.repo
@@ -1,7 +1,7 @@
 {{- if env.Getenv "RHOCP_MINOR_Y" "" -}}
 [rhocp-y]
-name = Red Hat OpenShift Container Platform 4.{{ .Env.RHOCP_MINOR_Y }} for RHEL 9
-baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y }}/os
+name = Red Hat OpenShift Container Platform {{ .Env.RHOCP_MAJOR_Y }}.{{ .Env.RHOCP_MINOR_Y }} for RHEL 9
+baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/{{ .Env.RHOCP_MAJOR_Y }}.{{ .Env.RHOCP_MINOR_Y }}/os
 enabled = 1
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/test/package-sources-bootc/microshift-rhocp-y1.repo b/test/package-sources-bootc/microshift-rhocp-y1.repo
@@ -1,7 +1,7 @@
 {{- if env.Getenv "RHOCP_MINOR_Y1" "" -}}
 [rhocp-y1]
-name = Red Hat OpenShift Container Platform 4.{{ .Env.RHOCP_MINOR_Y1 }} for RHEL 9
-baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y1 }}/os
+name = Red Hat OpenShift Container Platform {{ .Env.RHOCP_MAJOR_Y1 }}.{{ .Env.RHOCP_MINOR_Y1 }} for RHEL 9
+baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/{{ .Env.RHOCP_MAJOR_Y1 }}.{{ .Env.RHOCP_MINOR_Y1 }}/os
 enabled = 1
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/test/package-sources-bootc/microshift-rhocp-y2.repo b/test/package-sources-bootc/microshift-rhocp-y2.repo
@@ -1,7 +1,7 @@
 {{- if env.Getenv "RHOCP_MINOR_Y2" "" -}}
 [rhocp-y2]
-name = Red Hat OpenShift Container Platform 4.{{ .Env.RHOCP_MINOR_Y2 }} for RHEL 9
-baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y2 }}/os
+name = Red Hat OpenShift Container Platform {{ .Env.RHOCP_MAJOR_Y2 }}.{{ .Env.RHOCP_MINOR_Y2 }} for RHEL 9
+baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/{{ .Env.RHOCP_MAJOR_Y2 }}.{{ .Env.RHOCP_MINOR_Y2 }}/os
 enabled = 1
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh
@@ -5,7 +5,7 @@
 scenario_create_vms() {
     # The y-1 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.6-microshift-4.${PREVIOUS_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 
diff --git a/test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics/el96-yminus2@el102-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.6-microshift-4.${YMINUS2_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 
diff --git a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh
@@ -5,7 +5,7 @@
 scenario_create_vms() {
     # The y-1 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.6-microshift-4.${PREVIOUS_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 
diff --git a/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-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.6-microshift-4.${YMINUS2_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 
diff --git a/test/scenarios/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh b/test/scenarios/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.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.6-microshift-4.${PREVIOUS_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name = "rhel-9.6-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"`
	`1`	`+name = "rhel-9.6-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}"`
`2`	`2`	`description = "RHEL 9.6 with MicroShift from two minor versions back installed."`
`3`	`3`	`version = "0.0.1"`
`4`	`4`	`modules = []`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-rhel-9.6-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}`
	`1`	`+rhel-9.6-microshift-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}`