[release-4.22] USHIFT-6905: consolidate CI test scenarios to reduce VM count

scripts/lvms-helpers/cleanupWorkload.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ux
+set -eux
 
 # Set KUBECONFIG path - use dynamic IP-based path
 KUBECONFIG=${KUBECONFIG:-/var/lib/microshift/resources/kubeadmin/kubeconfig}

test/scenarios-bootc/el9/releases/el98-lrel@ai-model-serving-online.sh → test/scenarios-bootc/el10/releases/el102-lrel@ai-model-serving-online-fips.sh

@@ -2,7 +2,7 @@
 
 # Sourced from scenario.sh and uses functions defined there.
 
-start_image="rhel98-bootc-brew-lrel-optional"
+start_image="rhel102-bootc-brew-lrel-fips"
 
 # 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 rhel98-bootc --vm_disksize 30 --vm_vcpus 4
+    launch_vm rhel102-bootc --fips --vm_disksize 30 --vm_vcpus 4
 }
 
 scenario_remove_vms() {
@@ -37,5 +37,6 @@ scenario_run_tests() {
     exit_if_image_not_found "${start_image}"
 
     run_tests host1 \
-        suites/ai-model-serving/ai-model-serving-online.robot
+        suites/ai-model-serving/ai-model-serving-online.robot \
+        suites/fips/
 }

test/scenarios-bootc/el10/releases/el102-lrel@dual-stack.sh → test/scenarios-bootc/el10/releases/el102-lrel@dual-stack-configuration.sh

@@ -19,5 +19,7 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
     exit_if_image_not_found "${start_image}"
-    run_tests host1 suites/ipv6/dualstack.robot
+    run_tests host1 \
+        suites/ipv6/dualstack.robot \
+        suites/configuration/
 }

test/scenarios-bootc/el10/releases/el102-lrel@multi-config-standard1.sh

@@ -93,7 +93,6 @@ EOF"
     echo "INFO: Cleaning up LVMS workloads..."
     run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/cleanupWorkload.sh"
 
-    # 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:10.2" \

test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms.sh → test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard1.sh

@@ -14,7 +14,7 @@ scenario_create_vms() {
     exit_if_image_not_found "${dest_image}"
 
     prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
-    launch_vm rhel96-bootc --vm_vcpus 4
+    launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
 }
 
 scenario_remove_vms() {

test/scenarios-bootc/el10/releases/el98-lrel@el102-lrel@lvms.sh → test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard2.sh

@@ -6,15 +6,15 @@
 # ensure MicroShift is upgraded before running validation tests
 export TEST_RANDOMIZATION=none
 
-start_image="rhel98-bootc-brew-lrel-optional"
+start_image="rhel96-bootc-brew-y1-with-optional"
 dest_image="rhel102-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 "${start_image}"
-    launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4
+    launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
 }
 
 scenario_remove_vms() {
@@ -54,10 +54,11 @@ scenario_run_tests() {
     echo "INFO: Checking LVMS resources after upgrade..."
     run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/checkLvmsResources.sh"
 
-    # Run ginkgo tests to validate functionality
-    run_ginkgo_tests host1 "~Disruptive"
-
     # Cleanup LVMS workloads
     echo "INFO: Cleaning up LVMS workloads..."
     run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/cleanupWorkload.sh"
+
+    # Run standard2 suite for basic validation after upgrade
+    run_tests host1 \
+        suites/standard2/
 }

test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms.sh → test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard1.sh

@@ -14,7 +14,7 @@ scenario_create_vms() {
     exit_if_image_not_found "${dest_image}"
 
     prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
-    launch_vm rhel96-bootc --vm_vcpus 4
+    launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
 }
 
 scenario_remove_vms() {

test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard2.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+# NOTE: Unlike most suites, these tests rely on being run IN ORDER to
+# ensure MicroShift is upgraded before running validation tests
+export TEST_RANDOMIZATION=none
+
+start_image="rhel96-bootc-brew-y2-with-optional"
+dest_image="rhel102-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 "${start_image}"
+    launch_vm rhel96-bootc --vm_disksize 30 --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}"
+
+    # Wait for MicroShift to be ready
+    wait_for_microshift_to_be_ready host1
+
+    # Setup oc client and kubeconfig for ginkgo tests
+    setup_oc_and_kubeconfig host1
+
+    # Pre-upgrade: Create LVMS workloads and validate LVMS is working
+    echo "INFO: Creating LVMS workloads before upgrade..."
+    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/createWorkloads.sh"
+
+    echo "INFO: Checking LVMS resources before upgrade..."
+    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/checkLvmsResources.sh"
+
+    # Perform upgrade and validate
+    run_tests host1 \
+        --variable "TARGET_REF:${dest_image}" \
+        --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
+        suites/upgrade/upgrade-successful.robot
+
+    # Post-upgrade: Validate LVMS workloads survived the upgrade
+    echo "INFO: Checking LVMS workloads survived upgrade..."
+    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/checkWorkloadExists.sh"
+
+    echo "INFO: Checking LVMS resources after upgrade..."
+    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/checkLvmsResources.sh"
+
+    # Cleanup LVMS workloads
+    echo "INFO: Cleaning up LVMS workloads..."
+    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/cleanupWorkload.sh"
+
+    # Run standard2 suite for basic validation after upgrade
+    run_tests host1 \
+        suites/standard2/
+}