From fd1727fca5d7be4b9e614fc7e1ce2aaa65666e41 Mon Sep 17 00:00:00 2001 From: Kasturi Narra Date: Mon, 8 Dec 2025 14:59:13 +0530 Subject: [PATCH] Merge 4 release scenarios into two --- ...config.sh => el96-lrel@osconfig-router.sh} | 3 ++- .../releases/el96-lrel@router.sh | 25 ------------------- ...etry.sh => el96-lrel@storage-telemetry.sh} | 3 ++- .../releases/el96-lrel@storage.sh | 24 ------------------ 4 files changed, 4 insertions(+), 51 deletions(-) rename test/scenarios-bootc/releases/{el96-lrel@osconfig.sh => el96-lrel@osconfig-router.sh} (88%) delete mode 100644 test/scenarios-bootc/releases/el96-lrel@router.sh rename test/scenarios-bootc/releases/{el96-lrel@telemetry.sh => el96-lrel@storage-telemetry.sh} (91%) delete mode 100644 test/scenarios-bootc/releases/el96-lrel@storage.sh diff --git a/test/scenarios-bootc/releases/el96-lrel@osconfig.sh b/test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh similarity index 88% rename from test/scenarios-bootc/releases/el96-lrel@osconfig.sh rename to test/scenarios-bootc/releases/el96-lrel@osconfig-router.sh index ddaac99fc5..e2b4341b69 100644 --- a/test/scenarios-bootc/releases/el96-lrel@osconfig.sh +++ b/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 } diff --git a/test/scenarios-bootc/releases/el96-lrel@router.sh b/test/scenarios-bootc/releases/el96-lrel@router.sh deleted file mode 100644 index a7d2b44d29..0000000000 --- a/test/scenarios-bootc/releases/el96-lrel@router.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -start_image="rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-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 -} - -scenario_remove_vms() { - exit_if_image_not_found "${start_image}" - - remove_vm host1 -} - -scenario_run_tests() { - exit_if_image_not_found "${start_image}" - - run_tests host1 \ - suites/router -} diff --git a/test/scenarios-bootc/releases/el96-lrel@telemetry.sh b/test/scenarios-bootc/releases/el96-lrel@storage-telemetry.sh similarity index 91% rename from test/scenarios-bootc/releases/el96-lrel@telemetry.sh rename to test/scenarios-bootc/releases/el96-lrel@storage-telemetry.sh index 14f874dc43..1ba216e485 100644 --- a/test/scenarios-bootc/releases/el96-lrel@telemetry.sh +++ b/test/scenarios-bootc/releases/el96-lrel@storage-telemetry.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 } diff --git a/test/scenarios-bootc/releases/el96-lrel@storage.sh b/test/scenarios-bootc/releases/el96-lrel@storage.sh deleted file mode 100644 index c8b2be28b3..0000000000 --- a/test/scenarios-bootc/releases/el96-lrel@storage.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -start_image="rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-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 -} - -scenario_remove_vms() { - exit_if_image_not_found "${start_image}" - - remove_vm host1 -} - -scenario_run_tests() { - exit_if_image_not_found "${start_image}" - - run_tests host1 suites/storage/ -}