diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile similarity index 98% rename from test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-lrel-optional.containerfile rename to test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile index 5b40bdbfcd..6f2b5f0bed 100644 --- a/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-lrel-optional.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-brew diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile similarity index 98% rename from test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile rename to test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile index f3be4374d2..dbe666b5f7 100644 --- a/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-brew diff --git a/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-fips.containerfile b/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile similarity index 92% rename from test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-fips.containerfile rename to test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile index 4565c0f2b1..dc2ccc51ad 100644 --- a/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-fips.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-bootc-brew-lrel-optional:latest +FROM localhost/rhel98-bootc-brew-lrel-optional:latest # Add fips=1 kernel argument # See https://containers.github.io/bootc/building/kernel-arguments.html diff --git a/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc b/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc similarity index 56% rename from test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc rename to test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc index f45409026c..70e420b18a 100644 --- a/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc +++ b/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc @@ -1,3 +1,3 @@ {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}} -localhost/rhel96-bootc-brew-lrel-optional:latest +localhost/rhel98-bootc-brew-lrel-optional:latest {{- end }} diff --git a/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile b/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile similarity index 96% rename from test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile rename to test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile index e74e4b931a..c4b5179fca 100644 --- a/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-bootc-brew-lrel-optional:latest +FROM localhost/rhel98-bootc-brew-lrel-optional:latest # Enable microshift-tuned service RUN systemctl enable microshift-tuned diff --git a/test/scenarios-bootc/releases/el96-y1@el96-lrel@lvms.sh b/test/scenarios-bootc/releases/el96-y1@el98-lrel@lvms.sh similarity index 94% rename from test/scenarios-bootc/releases/el96-y1@el96-lrel@lvms.sh rename to test/scenarios-bootc/releases/el96-y1@el98-lrel@lvms.sh index a7bff7e647..18734be74c 100644 --- a/test/scenarios-bootc/releases/el96-y1@el96-lrel@lvms.sh +++ b/test/scenarios-bootc/releases/el96-y1@el98-lrel@lvms.sh @@ -7,7 +7,7 @@ export TEST_RANDOMIZATION=none start_image="rhel96-bootc-brew-y1-with-optional" -dest_image="rhel96-bootc-brew-lrel-optional" +dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -45,7 +45,6 @@ scenario_run_tests() { run_tests host1 \ --variable "TARGET_REF:${dest_image}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - --variable "EXPECTED_OS_VERSION:9.6" \ suites/upgrade/upgrade-successful.robot # Post-upgrade: Validate LVMS workloads survived the upgrade @@ -61,6 +60,6 @@ scenario_run_tests() { # Run standard1 suite for basic validation after upgrade run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el96-y1@el96-lrel@standard1.sh b/test/scenarios-bootc/releases/el96-y1@el98-lrel@standard1.sh similarity index 91% rename from test/scenarios-bootc/releases/el96-y1@el96-lrel@standard1.sh rename to test/scenarios-bootc/releases/el96-y1@el98-lrel@standard1.sh index fa2aa03740..472687343e 100644 --- a/test/scenarios-bootc/releases/el96-y1@el96-lrel@standard1.sh +++ b/test/scenarios-bootc/releases/el96-y1@el98-lrel@standard1.sh @@ -7,7 +7,7 @@ export TEST_RANDOMIZATION=none start_image="rhel96-bootc-brew-y1-with-optional" -dest_image="rhel96-bootc-brew-lrel-optional" +dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -31,7 +31,7 @@ scenario_run_tests() { run_tests host1 \ --variable "TARGET_REF:${dest_image}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ suites/upgrade/upgrade-successful.robot \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el96-y1@el96-lrel@standard2.sh b/test/scenarios-bootc/releases/el96-y1@el98-lrel@standard2.sh similarity index 93% rename from test/scenarios-bootc/releases/el96-y1@el96-lrel@standard2.sh rename to test/scenarios-bootc/releases/el96-y1@el98-lrel@standard2.sh index f991520901..4fd9c2f66e 100644 --- a/test/scenarios-bootc/releases/el96-y1@el96-lrel@standard2.sh +++ b/test/scenarios-bootc/releases/el96-y1@el98-lrel@standard2.sh @@ -7,7 +7,7 @@ export TEST_RANDOMIZATION=none start_image="rhel96-bootc-brew-y1-with-optional" -dest_image="rhel96-bootc-brew-lrel-optional" +dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -32,5 +32,5 @@ scenario_run_tests() { --variable "TARGET_REF:${dest_image}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot \ - suites/standard2 + suites/standard2/ } diff --git a/test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh b/test/scenarios-bootc/releases/el96-y2@el98-lrel@lvms.sh similarity index 96% rename from test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh rename to test/scenarios-bootc/releases/el96-y2@el98-lrel@lvms.sh index eceb5cb3ef..6f26e897cd 100644 --- a/test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh +++ b/test/scenarios-bootc/releases/el96-y2@el98-lrel@lvms.sh @@ -7,7 +7,7 @@ export TEST_RANDOMIZATION=none start_image="rhel96-bootc-brew-y2-with-optional" -dest_image="rhel96-bootc-brew-lrel-optional" +dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -45,7 +45,6 @@ scenario_run_tests() { run_tests host1 \ --variable "TARGET_REF:${dest_image}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - --variable "EXPECTED_OS_VERSION:9.6" \ suites/upgrade/upgrade-successful.robot # Post-upgrade: Validate LVMS workloads survived the upgrade diff --git a/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh b/test/scenarios-bootc/releases/el96-y2@el98-lrel@standard1.sh similarity index 65% rename from test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh rename to test/scenarios-bootc/releases/el96-y2@el98-lrel@standard1.sh index d528b0cad1..5e175aa93b 100644 --- a/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh +++ b/test/scenarios-bootc/releases/el96-y2@el98-lrel@standard1.sh @@ -6,27 +6,30 @@ # ensure MicroShift is upgraded before running standard suite tests export TEST_RANDOMIZATION=none -dest_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel96-bootc-brew-y2-with-optional" +dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { + exit_if_image_not_found "${start_image}" exit_if_image_not_found "${dest_image}" - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-brew-y2-with-optional + prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 } - scenario_remove_vms() { + exit_if_image_not_found "${start_image}" exit_if_image_not_found "${dest_image}" remove_vm host1 } - scenario_run_tests() { + exit_if_image_not_found "${start_image}" exit_if_image_not_found "${dest_image}" run_tests host1 \ --variable "TARGET_REF:${dest_image}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ + --variable "EXPECTED_OS_VERSION:9.8" \ suites/upgrade/upgrade-successful.robot \ - suites/standard2 + suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh b/test/scenarios-bootc/releases/el96-y2@el98-lrel@standard2.sh similarity index 68% rename from test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh rename to test/scenarios-bootc/releases/el96-y2@el98-lrel@standard2.sh index efdabde06c..77dbb34e84 100644 --- a/test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh +++ b/test/scenarios-bootc/releases/el96-y2@el98-lrel@standard2.sh @@ -6,28 +6,31 @@ # ensure MicroShift is upgraded before running standard suite tests export TEST_RANDOMIZATION=none -dest_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel96-bootc-brew-y2-with-optional" +dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { + exit_if_image_not_found "${start_image}" exit_if_image_not_found "${dest_image}" - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-brew-y2-with-optional + prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 } scenario_remove_vms() { + exit_if_image_not_found "${start_image}" exit_if_image_not_found "${dest_image}" remove_vm host1 } scenario_run_tests() { + exit_if_image_not_found "${start_image}" exit_if_image_not_found "${dest_image}" run_tests host1 \ --variable "TARGET_REF:${dest_image}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - --variable "EXPECTED_OS_VERSION:9.6" \ suites/upgrade/upgrade-successful.robot \ - suites/standard1/ + suites/standard2/ } diff --git a/test/scenarios-bootc/releases/el96-lrel@ai-model-serving-online.sh b/test/scenarios-bootc/releases/el98-lrel@ai-model-serving-online.sh similarity index 89% rename from test/scenarios-bootc/releases/el96-lrel@ai-model-serving-online.sh rename to test/scenarios-bootc/releases/el98-lrel@ai-model-serving-online.sh index 556c67c725..0348e0d28a 100644 --- a/test/scenarios-bootc/releases/el96-lrel@ai-model-serving-online.sh +++ b/test/scenarios-bootc/releases/el98-lrel@ai-model-serving-online.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" # Currently, RHOAI is only available for x86_64 check_platform() { @@ -22,7 +22,7 @@ scenario_create_vms() { # Increased disk size because of the additional embedded images (especially OVMS which is ~3.5GiB) LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@configuration.sh b/test/scenarios-bootc/releases/el98-lrel@configuration.sh similarity index 80% rename from test/scenarios-bootc/releases/el96-lrel@configuration.sh rename to test/scenarios-bootc/releases/el98-lrel@configuration.sh index 63c49e9cf3..04b2f666d1 100644 --- a/test/scenarios-bootc/releases/el96-lrel@configuration.sh +++ b/test/scenarios-bootc/releases/el98-lrel@configuration.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@dual-stack.sh b/test/scenarios-bootc/releases/el98-lrel@dual-stack.sh similarity index 80% rename from test/scenarios-bootc/releases/el96-lrel@dual-stack.sh rename to test/scenarios-bootc/releases/el98-lrel@dual-stack.sh index 5134b3620e..854249691d 100644 --- a/test/scenarios-bootc/releases/el96-lrel@dual-stack.sh +++ b/test/scenarios-bootc/releases/el98-lrel@dual-stack.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --network "${VM_DUAL_STACK_NETWORK}" --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --network "${VM_DUAL_STACK_NETWORK}" --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@fips.sh b/test/scenarios-bootc/releases/el98-lrel@fips.sh similarity index 85% rename from test/scenarios-bootc/releases/el96-lrel@fips.sh rename to test/scenarios-bootc/releases/el98-lrel@fips.sh index 18fac87514..0807fac048 100644 --- a/test/scenarios-bootc/releases/el96-lrel@fips.sh +++ b/test/scenarios-bootc/releases/el98-lrel@fips.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-fips" +start_image="rhel98-bootc-brew-lrel-fips" check_platform() { if [[ "${UNAME_M}" =~ aarch64 ]] ; then @@ -16,7 +16,7 @@ scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --fips --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --fips --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh b/test/scenarios-bootc/releases/el98-lrel@ginkgo-tests.sh similarity index 82% rename from test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh rename to test/scenarios-bootc/releases/el98-lrel@ginkgo-tests.sh index c7cb303abe..e0904e6521 100644 --- a/test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh +++ b/test/scenarios-bootc/releases/el98-lrel@ginkgo-tests.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@ipv6.sh b/test/scenarios-bootc/releases/el98-lrel@ipv6.sh similarity index 92% rename from test/scenarios-bootc/releases/el96-lrel@ipv6.sh rename to test/scenarios-bootc/releases/el98-lrel@ipv6.sh index f867b2804e..269c8d5cb2 100644 --- a/test/scenarios-bootc/releases/el96-lrel@ipv6.sh +++ b/test/scenarios-bootc/releases/el98-lrel@ipv6.sh @@ -8,7 +8,7 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_IPV6_NETWORK}")" # shellcheck disable=SC2034 # used elsewhere WEB_SERVER_URL="http://[${VM_BRIDGE_IP}]:${WEB_SERVER_PORT}" -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -23,7 +23,7 @@ scenario_create_vms() { # Enable IPv6 single stack in kickstart prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" false true MIRROR_REGISTRY_URL="${original_mirror_registry_url}" - launch_vm --boot_blueprint rhel96-bootc --network "${VM_IPV6_NETWORK}" --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --network "${VM_IPV6_NETWORK}" --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@iso-standard1.sh b/test/scenarios-bootc/releases/el98-lrel@iso-standard1.sh similarity index 84% rename from test/scenarios-bootc/releases/el96-lrel@iso-standard1.sh rename to test/scenarios-bootc/releases/el98-lrel@iso-standard1.sh index ca5557533e..16a0e0dbc7 100644 --- a/test/scenarios-bootc/releases/el96-lrel@iso-standard1.sh +++ b/test/scenarios-bootc/releases/el98-lrel@iso-standard1.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -21,6 +21,6 @@ scenario_run_tests() { exit_if_image_not_found "${start_image}" run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el96-lrel@iso-standard2.sh b/test/scenarios-bootc/releases/el98-lrel@iso-standard2.sh similarity index 84% rename from test/scenarios-bootc/releases/el96-lrel@iso-standard2.sh rename to test/scenarios-bootc/releases/el98-lrel@iso-standard2.sh index 266fd1ac0e..fadcb2d127 100644 --- a/test/scenarios-bootc/releases/el96-lrel@iso-standard2.sh +++ b/test/scenarios-bootc/releases/el98-lrel@iso-standard2.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -20,5 +20,5 @@ scenario_remove_vms() { scenario_run_tests() { exit_if_image_not_found "${start_image}" - run_tests host1 suites/standard2 + run_tests host1 suites/standard2/ } diff --git a/test/scenarios-bootc/releases/el96-lrel@low-latency.sh b/test/scenarios-bootc/releases/el98-lrel@low-latency.sh similarity index 93% rename from test/scenarios-bootc/releases/el96-lrel@low-latency.sh rename to test/scenarios-bootc/releases/el98-lrel@low-latency.sh index 314fa10fb5..a9356609b6 100644 --- a/test/scenarios-bootc/releases/el96-lrel@low-latency.sh +++ b/test/scenarios-bootc/releases/el98-lrel@low-latency.sh @@ -5,13 +5,13 @@ export TEST_RANDOMIZATION=none # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-tuned" +start_image="rhel98-bootc-brew-lrel-tuned" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" true - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 6 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 6 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@multi-config-standard1.sh b/test/scenarios-bootc/releases/el98-lrel@multi-config-standard1.sh similarity index 86% rename from test/scenarios-bootc/releases/el96-lrel@multi-config-standard1.sh rename to test/scenarios-bootc/releases/el98-lrel@multi-config-standard1.sh index e0c488e5b0..8d1c0bbdeb 100644 --- a/test/scenarios-bootc/releases/el96-lrel@multi-config-standard1.sh +++ b/test/scenarios-bootc/releases/el98-lrel@multi-config-standard1.sh @@ -16,13 +16,10 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_IPV6_NETWORK}")" # shellcheck disable=SC2034 # used elsewhere WEB_SERVER_URL="http://[${VM_BRIDGE_IP}]:${WEB_SERVER_PORT}" -start_image="rhel96-bootc-brew-lrel-tuned" +start_image="rhel98-bootc-brew-lrel-tuned" scenario_create_vms() { - if ! does_image_exist "${start_image}"; then - echo "Image '${start_image}' not found - skipping test" - return 0 - fi + exit_if_image_not_found "${start_image}" # Temporarily override MIRROR_REGISTRY_URL for kickstart preparation # The kickstart template needs a hostname-based URL, not an IPv6 address @@ -37,23 +34,17 @@ scenario_create_vms() { # shellcheck disable=SC2034 # used elsewhere MIRROR_REGISTRY_URL="${original_mirror_url}" - launch_vm --boot_blueprint rhel96-bootc --network "${VM_IPV6_NETWORK}" --vm_vcpus 6 + launch_vm --boot_blueprint rhel98-bootc --network "${VM_IPV6_NETWORK}" --vm_vcpus 6 } scenario_remove_vms() { - if ! does_image_exist "${start_image}"; then - echo "Image '${start_image}' not found - skipping test" - return 0 - fi + exit_if_image_not_found "${start_image}" remove_vm host1 } scenario_run_tests() { - if ! does_image_exist "${start_image}"; then - echo "Image '${start_image}' not found - skipping test" - return 0 - fi + exit_if_image_not_found "${start_image}" # Wait for microshift-tuned to reboot the node local -r start_time=$(date +%s) @@ -107,7 +98,7 @@ EOF" # Run all standard1 tests except version (which requires RPM install verification) echo "INFO: Running validation tests for multi-config scenario..." run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ --exclude version \ suites/standard1/ diff --git a/test/scenarios-bootc/releases/el96-lrel@multi-config-standard2.sh b/test/scenarios-bootc/releases/el98-lrel@multi-config-standard2.sh similarity index 96% rename from test/scenarios-bootc/releases/el96-lrel@multi-config-standard2.sh rename to test/scenarios-bootc/releases/el98-lrel@multi-config-standard2.sh index 8c6bb6e00e..bf9b447190 100644 --- a/test/scenarios-bootc/releases/el96-lrel@multi-config-standard2.sh +++ b/test/scenarios-bootc/releases/el98-lrel@multi-config-standard2.sh @@ -16,7 +16,7 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_IPV6_NETWORK}")" # shellcheck disable=SC2034 # used elsewhere WEB_SERVER_URL="http://[${VM_BRIDGE_IP}]:${WEB_SERVER_PORT}" -start_image="rhel96-bootc-brew-lrel-tuned" +start_image="rhel98-bootc-brew-lrel-tuned" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -37,7 +37,7 @@ scenario_create_vms() { # shellcheck disable=SC2034 # used elsewhere MIRROR_REGISTRY_URL="${original_mirror_url}" - launch_vm --boot_blueprint rhel96-bootc --network "${VM_IPV6_NETWORK}" --vm_vcpus 6 + launch_vm --boot_blueprint rhel98-bootc --network "${VM_IPV6_NETWORK}" --vm_vcpus 6 } scenario_remove_vms() { @@ -106,7 +106,6 @@ EOF" # Run all standard2 tests except default-config (which conflicts with TLS drop-in config) echo "INFO: Running validation tests for multi-config scenario..." run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ --exclude default-config \ suites/standard2/ diff --git a/test/scenarios-bootc/releases/el96-lrel@multi-nic.sh b/test/scenarios-bootc/releases/el98-lrel@multi-nic.sh similarity index 89% rename from test/scenarios-bootc/releases/el96-lrel@multi-nic.sh rename to test/scenarios-bootc/releases/el98-lrel@multi-nic.sh index c72751e224..86c5f365cc 100644 --- a/test/scenarios-bootc/releases/el96-lrel@multi-nic.sh +++ b/test/scenarios-bootc/releases/el98-lrel@multi-nic.sh @@ -2,14 +2,14 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" # Using multus as secondary network to have 2 nics in different networks. - launch_vm --boot_blueprint rhel96-bootc --network default,"${VM_MULTUS_NETWORK}" --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --network default,"${VM_MULTUS_NETWORK}" --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@nightly-brew-standard1.sh b/test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard1.sh similarity index 73% rename from test/scenarios-bootc/releases/el96-lrel@nightly-brew-standard1.sh rename to test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard1.sh index c5c7cc929e..3ea31f80c5 100644 --- a/test/scenarios-bootc/releases/el96-lrel@nightly-brew-standard1.sh +++ b/test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard1.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image=rhel96-bootc-brew-nightly-with-optional +start_image="rhel98-bootc-brew-nightly-with-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -21,6 +21,6 @@ scenario_run_tests() { exit_if_image_not_found "${start_image}" run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el96-lrel@nightly-brew-standard2.sh b/test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard2.sh similarity index 72% rename from test/scenarios-bootc/releases/el96-lrel@nightly-brew-standard2.sh rename to test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard2.sh index 0705148359..be0e2b85a1 100644 --- a/test/scenarios-bootc/releases/el96-lrel@nightly-brew-standard2.sh +++ b/test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard2.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image=rhel96-bootc-brew-nightly-with-optional +start_image="rhel98-bootc-brew-nightly-with-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -20,6 +20,5 @@ scenario_remove_vms() { scenario_run_tests() { exit_if_image_not_found "${start_image}" - run_tests host1 suites/standard2 + run_tests host1 suites/standard2/ } - diff --git a/test/scenarios-bootc/releases/el96-lrel@optional.sh b/test/scenarios-bootc/releases/el98-lrel@optional.sh similarity index 92% rename from test/scenarios-bootc/releases/el96-lrel@optional.sh rename to test/scenarios-bootc/releases/el98-lrel@optional.sh index 4b17291d0a..49df0429cd 100644 --- a/test/scenarios-bootc/releases/el96-lrel@optional.sh +++ b/test/scenarios-bootc/releases/el98-lrel@optional.sh @@ -7,7 +7,7 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")" # shellcheck disable=SC2034 # used elsewhere WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}" -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -19,7 +19,7 @@ scenario_create_vms() { fi LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface) - launch_vm --boot_blueprint rhel96-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh b/test/scenarios-bootc/releases/el98-lrel@osconfig-router.sh similarity index 79% rename from test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh rename to test/scenarios-bootc/releases/el98-lrel@osconfig-router.sh index 3b1d5b16ec..30ab73f45c 100644 --- a/test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh +++ b/test/scenarios-bootc/releases/el98-lrel@osconfig-router.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -23,5 +23,5 @@ scenario_run_tests() { run_tests host1 \ suites/osconfig/clusterid.robot \ suites/osconfig/systemd-resolved.robot \ - suites/router + suites/router/ } diff --git a/test/scenarios-bootc/releases/el96-lrel@storage-telemetry.sh b/test/scenarios-bootc/releases/el98-lrel@storage-telemetry.sh similarity index 80% rename from test/scenarios-bootc/releases/el96-lrel@storage-telemetry.sh rename to test/scenarios-bootc/releases/el98-lrel@storage-telemetry.sh index 2e6c77d409..96d551059f 100644 --- a/test/scenarios-bootc/releases/el96-lrel@storage-telemetry.sh +++ b/test/scenarios-bootc/releases/el98-lrel@storage-telemetry.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -22,7 +22,7 @@ scenario_run_tests() { run_tests host1 \ --variable "PROXY_HOST:${VM_BRIDGE_IP}" \ - --variable "PROXY_PORT:9001" \ + --variable "PROXY_PORT:9001" \ --variable "PROMETHEUS_HOST:$(hostname)" \ suites/storage/ \ suites/telemetry/telemetry.robot diff --git a/test/scenarios-bootc/releases/el96-lrel@tlsv13-standard1.sh b/test/scenarios-bootc/releases/el98-lrel@tlsv13-standard1.sh similarity index 89% rename from test/scenarios-bootc/releases/el96-lrel@tlsv13-standard1.sh rename to test/scenarios-bootc/releases/el98-lrel@tlsv13-standard1.sh index 34a1463353..63d7af1429 100644 --- a/test/scenarios-bootc/releases/el96-lrel@tlsv13-standard1.sh +++ b/test/scenarios-bootc/releases/el98-lrel@tlsv13-standard1.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -42,6 +42,6 @@ EOF" record_junit "${vmname}" "pre_test_greenboot_check" "OK" run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el96-lrel@tlsv13-standard2.sh b/test/scenarios-bootc/releases/el98-lrel@tlsv13-standard2.sh similarity index 86% rename from test/scenarios-bootc/releases/el96-lrel@tlsv13-standard2.sh rename to test/scenarios-bootc/releases/el98-lrel@tlsv13-standard2.sh index 6700bf5b89..3838af2203 100644 --- a/test/scenarios-bootc/releases/el96-lrel@tlsv13-standard2.sh +++ b/test/scenarios-bootc/releases/el98-lrel@tlsv13-standard2.sh @@ -2,13 +2,13 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel96-bootc-brew-lrel-optional" +start_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel96-bootc + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -41,7 +41,5 @@ EOF" fi record_junit "${vmname}" "pre_test_greenboot_check" "OK" - run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ - suites/standard2/ + run_tests host1 suites/standard2/ }