Merge pull request #6043 from kasturinarra/ushift-6433

USHIFT-6433: Move cleanup before RF cases

Author: openshift-merge-bot[bot]

test/scenarios-bootc/releases/el96-y1@el96-lrel@lvms.sh

@@ -55,12 +55,12 @@ scenario_run_tests() {
     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 standard1 suite for basic validation after upgrade
     run_tests host1 \
         --variable "EXPECTED_OS_VERSION:9.6" \
         suites/standard1/
-
-    # Cleanup LVMS workloads
-    echo "INFO: Cleaning up LVMS workloads..."
-    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/cleanupWorkload.sh"
 }

test/scenarios/releases/el96-yminus1@el96-lrel@lvms.sh

@@ -54,12 +54,12 @@ scenario_run_tests() {
     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 standard1 suite for basic validation after upgrade
     run_tests host1 \
         --variable "EXPECTED_OS_VERSION:9.6" \
         suites/standard1/
-
-    # Cleanup LVMS workloads
-    echo "INFO: Cleaning up LVMS workloads..."
-    run_command_on_vm host1 'bash -s' < "${TESTDIR}/../scripts/lvms-helpers/cleanupWorkload.sh"
 }