Merge pull request #6321 from ggiguash/rhel98-ostree-release

USHIFT-6524: Switch ostree release images and scenarios to RHEL 9.8

Author: openshift-merge-bot[bot]

test/README.md

@@ -277,7 +277,7 @@ rhel-9.2
 
 #### Bootc Image Customization
 
-Bootc images are defined by templated `containerfile` definitions. 
+Bootc images are defined by templated `containerfile` definitions.
 These files are written with [golang templating syntax](https://pkg.go.dev/text/template)
 and executed during the image build process.
 
@@ -608,11 +608,10 @@ The `launch_vm` function takes as input the VM name. It expects a
 kickstart file to already exist, and it defines a new VM configured to
 boot from the installer ISO and the kickstart file.
 
-The `launch_vm` function also accepts two optional arguments:
-- The image blueprint used to create the ISO that should
-be used to boot the VM (default to `$DEFAULT_BOOT_BLUEPRINT`).
-- The name of the network used when creating the VM
-(defaults to `default`).
+The `launch_vm` function also accepts two arguments:
+- The mandatory image blueprint used to create the ISO that should be used
+  to boot the VM.
+- The name of the network used when creating the VM (defaults to `default`).
 
 #### scenario_remove_vms
 

test/bin/scenario.sh

@@ -16,7 +16,6 @@ source "${SCRIPTDIR}/common.sh"
 # shellcheck source=test/bin/common_versions.sh
 source "${SCRIPTDIR}/common_versions.sh"
 
-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}")"
@@ -675,12 +674,11 @@ EOF
 # Creates a new VM using the scenario name and the vmname given to
 # create a unique name. Uses the boot_blueprint and network
 # arguments to select the ISO and networks from which to boot.
-# If no boot_blueprint is specified, uses DEFAULT_BOOT_BLUEPRINT.
 # If no network is specified, uses the "default" network.
 #
 # Usage: launch_vm \
+#           <boot_blueprint> \
 #           [--vmname <name>] \
-#           [--boot_blueprint <blueprint>] \
 #           [--network <name>[,<name>...]] \
 #           [--vm_vcpus <vcpus>] \
 #           [--vm_memory <memory>] \
@@ -689,35 +687,44 @@ EOF
 #           [--no_network]
 #
 # Arguments:
-#   [--vmname <name>]: The short name of the VM in the scenario (e.g., "host1").
-#   [--boot_blueprint <blueprint>]: The image blueprint used to create the ISO that
-#                                   should be used to boot the VM. This is _not_
-#                                   necessarily the image to be installed (see
-#                                   prepare_kickstart).
+#   <boot_blueprint>:               Mandatory. The name of the image blueprint
+#                                   used to create the ISO that should be used
+#                                   to boot the VM. This is _not_ necessarily the
+#                                   image to be installed (see prepare_kickstart).
+#   [--vmname <name>]:              The short name of the VM in the scenario
+#                                   (e.g., "host1").
 #   [--network <name>[,<name>...]]: A comma-separated list for the networks used
 #                                   when creating the VM. Each network entry will
 #                                   create a NIC and they are repeatable.
-#   [--no-network]: Do not configure any network attachments (and therefore no
-#                   NICs) for the VM.
-#   [--vm_vcpus <vcpus>]: Number of vCPUs for the VM.
-#   [--vm_memory <memory>]: Size of RAM in MB for the VM.
-#   [--vm_disksize <disksize>]: Size of disk in GB for the VM.
-#   [--fips]: Enable FIPS mode
-
+#   [--no_network]:                 Do not configure any network attachments (and
+#                                   therefore no NICs) for the VM.
+#   [--vm_vcpus <vcpus>]:           Number of vCPUs for the VM.
+#   [--vm_memory <memory>]:         Size of RAM in MB for the VM.
+#   [--vm_disksize <disksize>]:     Size of disk in GB for the VM.
+#   [--fips]:                       Enable FIPS mode for the VM.
 launch_vm() {
-    # set defaults
+    # Set default values for the optional arguments
     local vmname="host1"
-    local boot_blueprint="${DEFAULT_BOOT_BLUEPRINT}"
     local network="default"
     local vm_memory=4096
     local vm_vcpus=2
     local vm_disksize=20
     local fips_mode=0
     local kernel_location="images/pxeboot"
 
+    # Parse the mandatory arguments
+    local -r boot_blueprint="${1:-}"
+    if [ -z "${boot_blueprint}" ]; then
+        error "Boot blueprint is not set"
+        record_junit "${vmname}" "vm-launch-args" "FAILED"
+        exit 1
+    fi
+    shift
+
+    # Parse the optional arguments
     while [ $# -gt 0 ]; do
         case "$1" in
-            --vmname|--boot_blueprint|--vm_vcpus|--vm_memory|--vm_disksize)
+            --vmname|--vm_vcpus|--vm_memory|--vm_disksize)
                 var="${1/--/}"
                 if [ -n "$2" ] && [ "${2:0:1}" != "-" ]; then
                     declare "${var}=$2"

test/image-blueprints/README.md

@@ -9,14 +9,14 @@ each layer or group under `test/image-blueprints` directory.
 Artifacts built in this layer are cached.
 
 Groups 1-to-3 enforce an ordered build chain, necessary to satisfy a mandatory
-layer dependency of `rhel94 os-only -> rhel94 y-2 -> rhel94 y-1`, which is needed
+layer dependency of `rhel9x os-only -> rhel9x y-2 -> rhel9x y-1`, which is needed
 for testing upgrades.
 
 |Group |Build Time|Description|
 |------|----------|-----------|
-|group1| Short    | RHEL 9.4 and 9.6 OS-only base layer
-|group2| Short    | RHEL 9.4 layer with MicroShift `y-2` packages
-|group3| Short    | RHEL 9.4 layer with MicroShift `y-1` packages
+|group1| Short    | RHEL 9.x OS-only base layer
+|group2| Short    | RHEL 9.x layer with MicroShift `y-2` packages
+|group3| Short    | RHEL 9.x layer with MicroShift `y-1` packages
 |group4| Average  | Other artifacts independent of current sources
 
 > Note: Total build times are up to 30 minutes.
@@ -48,13 +48,13 @@ The artifacts are only used by periodic CI jobs.
 Artifacts built in this layer are cached as they depend on Brew RPM packages available only behind the VPN.
 
 Groups 1-to-2 enforce an ordered build chain, necessary to satisfy a mandatory
-layer dependency of `rhel96 os-only -> rhel96 y-2 -> rhel96 y-1`, which is needed
+layer dependency of `rhel9x os-only -> rhel9x y-2 -> rhel9x y-1`, which is needed
 for testing upgrades.
 
 |Group |Build Time|Description|
 |------|----------|-----------|
-|group1| Short    | RHEL 9.6 layer with MicroShift `y-2` Brew packages
-|group2| Short    | RHEL 9.6 layer with MicroShift `y-1` Brew packages
+|group1| Short    | RHEL 9.x layer with MicroShift `y-2` Brew packages
+|group2| Short    | RHEL 9.x layer with MicroShift `y-1` Brew packages
 |group3| Average  | Brew RPM blueprints for release testing (EC, RC, z-stream, nightly, tuned)
 |group4| Average  | Image installers for release testing (EC, RC, z-stream)
 

…se/group3/rhel96-brew-lrel-optional.toml …se/group3/rhel98-brew-lrel-optional.tomltest/image-blueprints/layer4-release/group3/rhel96-brew-lrel-optional.toml renamed to test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml test/image-blueprints/layer4-release/group3/rhel96-brew-lrel-optional.toml renamed to test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml

@@ -8,12 +8,12 @@
 
 */ -}}
 
-name = "rhel96-brew-lrel-optional"
-description = "A RHEL 9.6 image with latest release RPMs (EC, RC, or Z-stream): {{ .Env.BREW_LREL_RELEASE_VERSION }}"
+name = "rhel98-brew-lrel-optional"
+description = "A RHEL 9.8 image with latest release RPMs (EC, RC, or Z-stream): {{ .Env.BREW_LREL_RELEASE_VERSION }}"
 version = "0.0.1"
 modules = []
 groups = []
-distro = "rhel-96"
+distro = "rhel-98"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'

…lease/group3/rhel96-brew-lrel-tuned.toml …up3/rhel98-brew-lrel-tuned.toml.disabledtest/image-blueprints/layer4-release/group3/rhel96-brew-lrel-tuned.toml renamed to test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-tuned.toml.disabled test/image-blueprints/layer4-release/group3/rhel96-brew-lrel-tuned.toml renamed to test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-tuned.toml.disabled

@@ -8,12 +8,12 @@
 
 */ -}}
 
-name = "rhel96-brew-lrel-tuned"
-description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_LREL_RELEASE_VERSION }}"
+name = "rhel98-brew-lrel-tuned"
+description = "A RHEL 9.8 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_LREL_RELEASE_VERSION }}"
 version = "0.0.1"
 modules = []
 groups = []
-distro = "rhel-96"
+distro = "rhel-98"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'

…/rhel96-brew-nightly-with-optionals.toml …/rhel98-brew-nightly-with-optionals.tomltest/image-blueprints/layer4-release/group3/rhel96-brew-nightly-with-optionals.toml renamed to test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml test/image-blueprints/layer4-release/group3/rhel96-brew-nightly-with-optionals.toml renamed to test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml

@@ -8,12 +8,12 @@
 
 */ -}}
 
-name = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-nightly"
-description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_NIGHTLY_RELEASE_VERSION }}"
+name = "rhel-9.8-microshift-brew-optionals-4.{{ .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 = []
 groups = []
-distro = "rhel-96"
+distro = "rhel-98"
 
 # Parent specification directive recognized by test/bin/build_images.sh to be
 # used with the '--parent' argument of 'osbuild-composer'

…hel96-brew-lrel-optional.image-installer …hel98-brew-lrel-optional.image-installertest/image-blueprints/layer4-release/group4/rhel96-brew-lrel-optional.image-installer renamed to test/image-blueprints/layer4-release/group4/rhel98-brew-lrel-optional.image-installer test/image-blueprints/layer4-release/group4/rhel96-brew-lrel-optional.image-installer renamed to test/image-blueprints/layer4-release/group4/rhel98-brew-lrel-optional.image-installer

@@ -1,3 +1,3 @@
 {{- if and (env.Getenv "BREW_LREL_RELEASE_VERSION" "") (env.Getenv "BREW_Y1_RELEASE_VERSION" "") -}}
-rhel96-brew-lrel-optional
+rhel98-brew-lrel-optional
 {{- end -}}

test/scenarios-bootc/periodics/el102-src@optional.sh

@@ -16,7 +16,7 @@ scenario_create_vms() {
     fi
     LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source-optionals
     # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
-    launch_vm --boot_blueprint rhel102-bootc --network "${networks}" --vm_disksize 25
+    launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25
 }
 
 scenario_remove_vms() {

test/scenarios-bootc/periodics/el102-src@standard-suite1.sh

@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source
-    launch_vm --boot_blueprint rhel102-bootc
+    launch_vm rhel102-bootc
 }
 
 scenario_remove_vms() {

test/scenarios-bootc/periodics/el102-src@standard-suite2.sh

@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source
-    launch_vm --boot_blueprint rhel102-bootc
+    launch_vm rhel102-bootc
 }
 
 scenario_remove_vms() {