Merge pull request #6026 from openshift-cherrypick-robot/cherry-pick-5994-to-release-4.21

[release-4.21] USHIFT-6360: Merge 4 release scenarios into two

Author: openshift-merge-bot[bot]

…ios-bootc/releases/el96-lrel@osconfig.sh …tc/releases/el96-lrel@osconfig-router.shtest/scenarios-bootc/releases/el96-lrel@osconfig.sh renamed to test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh test/scenarios-bootc/releases/el96-lrel@osconfig.sh renamed to test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh

@@ -22,5 +22,6 @@ scenario_run_tests() {
 
     run_tests host1 \
         suites/osconfig/clusterid.robot \
-        suites/osconfig/systemd-resolved.robot
+        suites/osconfig/systemd-resolved.robot \
+        suites/router
 }

test/scenarios-bootc/releases/el96-lrel@router.sh

@@ -22,7 +22,8 @@ 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
 }