Move cleanup before RF cases

Author: Kasturi Narra

test/assets/common_versions.sh.template

@@ -164,6 +164,6 @@ export BREW_LREL_RELEASE_VERSION
 
 # Branch and commit for the openshift-tests-private repository
 OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-4.${{MINOR_VERSION}}"
-OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="b28bd22e0778a177887dfafe556c61ab354e9bfe"
+OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="2cca64bd4c9ff09799f19441b8d9e79462561ee9"
 export OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH
 export OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT

test/bin/common_versions.sh

@@ -164,6 +164,6 @@ export BREW_LREL_RELEASE_VERSION
 
 # Branch and commit for the openshift-tests-private repository
 OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-4.${MINOR_VERSION}"
-OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="b28bd22e0778a177887dfafe556c61ab354e9bfe"
+OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="2cca64bd4c9ff09799f19441b8d9e79462561ee9"
 export OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH
 export OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT

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"
 }