diff --git a/test/bin/c2cc_common.sh b/test/bin/c2cc_common.sh index 9268aa2811..454722dfd3 100644 --- a/test/bin/c2cc_common.sh +++ b/test/bin/c2cc_common.sh @@ -238,6 +238,12 @@ c2cc_run_tests() { local -r suites_dir="${1}" local -r foreign_cidr="${2:-}" local -r ip_family="${3:-}" + local -r include_tags="${4:-c2cc}" + + local include_args="" + for tag in ${include_tags}; do + include_args+="--include ${tag} " + done local foreign_cidr_var="" if [ -n "${foreign_cidr}" ]; then @@ -318,6 +324,7 @@ c2cc_run_tests() { ${target_ref_var} \ ${dual_cidr_vars} \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ + ${include_args} \ "${suites_dir}" } diff --git a/test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh index fea38e9eb1..35c1c30644 100755 --- a/test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh +++ b/test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh @@ -20,5 +20,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/disruptive/" + c2cc_run_tests "suites/c2cc/" "" "" "disruptive" } diff --git a/test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.sh index 794586d645..74b3e77ef2 100755 --- a/test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.sh +++ b/test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.sh @@ -37,5 +37,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/basic/" "192.0.2.0/24" dual-stack + c2cc_run_tests "suites/c2cc/" "192.0.2.0/24" dual-stack "basic" } diff --git a/test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh index 2c6e13d50d..36f24409c4 100644 --- a/test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh +++ b/test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh @@ -26,5 +26,5 @@ scenario_run_tests() { configure_c2cc_hosts "c2cc_ipsec_pre_greenboot" "c2cc_ipsec_greenboot" configure_ipsec - c2cc_run_tests "suites/c2cc/ipsec/" + c2cc_run_tests "suites/c2cc/" "" "" "ipsec" } diff --git a/test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh index 93040a4bdd..c3c2dc67d5 100644 --- a/test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh +++ b/test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh @@ -43,5 +43,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/basic/" "2001:db8::/64" ipv6 + c2cc_run_tests "suites/c2cc/" "2001:db8::/64" ipv6 "basic" } diff --git a/test/scenarios-bootc/c2cc/el102-src@c2cc.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc.sh index ff4b4fb75a..f9741c8999 100644 --- a/test/scenarios-bootc/c2cc/el102-src@c2cc.sh +++ b/test/scenarios-bootc/c2cc/el102-src@c2cc.sh @@ -16,5 +16,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/basic/" "192.0.2.0/24" + c2cc_run_tests "suites/c2cc/" "192.0.2.0/24" "" "basic" } diff --git a/test/scenarios-bootc/c2cc/el98-src@c2cc-disruptive.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc-disruptive.sh index 3e25709b2d..79cab102e4 100755 --- a/test/scenarios-bootc/c2cc/el98-src@c2cc-disruptive.sh +++ b/test/scenarios-bootc/c2cc/el98-src@c2cc-disruptive.sh @@ -20,5 +20,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/disruptive/" + c2cc_run_tests "suites/c2cc/" "" "" "disruptive" } diff --git a/test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v6.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v6.sh index 962f559299..ebfb21243b 100755 --- a/test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v6.sh +++ b/test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v6.sh @@ -39,5 +39,5 @@ scenario_run_tests() { configure_c2cc_hosts # IP_FAMILY=ipv6 so IP_CMD defaults to 'ip -6' for primary (IPv6) CIDRs. # Dual-stack (IPv4) tests derive ip_cmd from CIDR content via IP Command For CIDR. - c2cc_run_tests "suites/c2cc/basic/" "2001:db8::/64" ipv6 + c2cc_run_tests "suites/c2cc/" "2001:db8::/64" ipv6 "basic" } diff --git a/test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh index e9900c4c7a..bedf9aabbd 100644 --- a/test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh +++ b/test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh @@ -26,5 +26,5 @@ scenario_run_tests() { configure_c2cc_hosts "c2cc_ipsec_pre_greenboot" "c2cc_ipsec_greenboot" configure_ipsec - c2cc_run_tests "suites/c2cc/ipsec/" + c2cc_run_tests "suites/c2cc/" "" "" "ipsec" } diff --git a/test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh index 349cebf36b..def450bdd9 100644 --- a/test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh +++ b/test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh @@ -43,5 +43,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/basic/" "2001:db8::/64" ipv6 + c2cc_run_tests "suites/c2cc/" "2001:db8::/64" ipv6 "basic" } diff --git a/test/scenarios-bootc/c2cc/el98-src@c2cc.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc.sh index be9cc79ecb..23a8a9ddab 100644 --- a/test/scenarios-bootc/c2cc/el98-src@c2cc.sh +++ b/test/scenarios-bootc/c2cc/el98-src@c2cc.sh @@ -16,5 +16,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/basic/" "192.0.2.0/24" + c2cc_run_tests "suites/c2cc/" "192.0.2.0/24" "" "basic" } diff --git a/test/scenarios-bootc/c2cc/el98-src@el102-src@c2cc-upgrade-ok.sh b/test/scenarios-bootc/c2cc/el98-src@el102-src@c2cc-upgrade-ok.sh index eaaa59bab4..707dd08f95 100755 --- a/test/scenarios-bootc/c2cc/el98-src@el102-src@c2cc-upgrade-ok.sh +++ b/test/scenarios-bootc/c2cc/el98-src@el102-src@c2cc-upgrade-ok.sh @@ -21,5 +21,5 @@ scenario_remove_vms() { scenario_run_tests() { # shellcheck disable=SC2119 configure_c2cc_hosts - c2cc_run_tests "suites/c2cc/upgrade/" + c2cc_run_tests "suites/c2cc/" "" "" "upgrade" } diff --git a/test/suites/c2cc/basic/cleanup.robot b/test/suites/c2cc/basic/cleanup.robot index 2e2feeac8f..1e15b6e33c 100644 --- a/test/suites/c2cc/basic/cleanup.robot +++ b/test/suites/c2cc/basic/cleanup.robot @@ -11,7 +11,7 @@ Resource ../../../resources/c2cc.resource Suite Setup Setup Suite Teardown Teardown -Test Tags c2cc +Test Tags c2cc basic *** Variables *** diff --git a/test/suites/c2cc/basic/connectivity.robot b/test/suites/c2cc/basic/connectivity.robot index 8dd91b3e76..0a25851b7d 100644 --- a/test/suites/c2cc/basic/connectivity.robot +++ b/test/suites/c2cc/basic/connectivity.robot @@ -11,7 +11,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup deploy_workloads=${TRUE} Suite Teardown C2CC Suite Teardown cleanup_workloads=${TRUE} -Test Tags c2cc +Test Tags c2cc basic *** Test Cases *** diff --git a/test/suites/c2cc/basic/custom-route-tables.robot b/test/suites/c2cc/basic/custom-route-tables.robot index bfe01ff176..2e92bdc3a8 100644 --- a/test/suites/c2cc/basic/custom-route-tables.robot +++ b/test/suites/c2cc/basic/custom-route-tables.robot @@ -18,7 +18,7 @@ Resource ../../../resources/c2cc.resource Suite Setup Setup Suite Teardown Teardown -Test Tags c2cc +Test Tags c2cc basic *** Variables *** diff --git a/test/suites/c2cc/basic/dns.robot b/test/suites/c2cc/basic/dns.robot index dcb7f6e748..acd6855e74 100644 --- a/test/suites/c2cc/basic/dns.robot +++ b/test/suites/c2cc/basic/dns.robot @@ -12,7 +12,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup deploy_workloads=${TRUE} Suite Teardown C2CC Suite Teardown cleanup_workloads=${TRUE} -Test Tags c2cc +Test Tags c2cc basic *** Test Cases *** diff --git a/test/suites/c2cc/basic/healthcheck.robot b/test/suites/c2cc/basic/healthcheck.robot index 21dbe9a505..7110bfb6a5 100644 --- a/test/suites/c2cc/basic/healthcheck.robot +++ b/test/suites/c2cc/basic/healthcheck.robot @@ -11,7 +11,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup Suite Teardown C2CC Suite Teardown -Test Tags c2cc +Test Tags c2cc basic *** Test Cases *** diff --git a/test/suites/c2cc/basic/infrastructure.robot b/test/suites/c2cc/basic/infrastructure.robot index b92ba322e2..b00399d08c 100644 --- a/test/suites/c2cc/basic/infrastructure.robot +++ b/test/suites/c2cc/basic/infrastructure.robot @@ -11,7 +11,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup Suite Teardown C2CC Suite Teardown -Test Tags c2cc +Test Tags c2cc basic *** Test Cases *** diff --git a/test/suites/c2cc/basic/probe.robot b/test/suites/c2cc/basic/probe.robot index 6840d9b381..52115cbe4d 100644 --- a/test/suites/c2cc/basic/probe.robot +++ b/test/suites/c2cc/basic/probe.robot @@ -12,7 +12,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup Suite Teardown C2CC Suite Teardown -Test Tags c2cc +Test Tags c2cc basic *** Variables *** diff --git a/test/suites/c2cc/basic/reconciliation.robot b/test/suites/c2cc/basic/reconciliation.robot index 79686139e9..78ca41db14 100644 --- a/test/suites/c2cc/basic/reconciliation.robot +++ b/test/suites/c2cc/basic/reconciliation.robot @@ -11,7 +11,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup Suite Teardown C2CC Suite Teardown -Test Tags c2cc +Test Tags c2cc basic *** Variables *** diff --git a/test/suites/c2cc/basic/sanity.robot b/test/suites/c2cc/basic/sanity.robot index 573f73e757..8211b1bf9d 100644 --- a/test/suites/c2cc/basic/sanity.robot +++ b/test/suites/c2cc/basic/sanity.robot @@ -10,7 +10,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup Suite Teardown C2CC Suite Teardown -Test Tags c2cc +Test Tags c2cc basic *** Test Cases *** diff --git a/test/suites/c2cc/disruptive/disruptive.robot b/test/suites/c2cc/disruptive/disruptive.robot index 612c84a10e..9eea7ce34e 100644 --- a/test/suites/c2cc/disruptive/disruptive.robot +++ b/test/suites/c2cc/disruptive/disruptive.robot @@ -12,7 +12,7 @@ Resource ../../../resources/c2cc.resource Suite Setup C2CC Suite Setup deploy_workloads=${TRUE} Suite Teardown C2CC Suite Teardown cleanup_workloads=${TRUE} -Test Tags disruptive +Test Tags c2cc disruptive *** Variables *** diff --git a/test/suites/c2cc/disruptive/reboot.robot b/test/suites/c2cc/disruptive/reboot.robot index 49e868a7ca..f13cdae1d1 100644 --- a/test/suites/c2cc/disruptive/reboot.robot +++ b/test/suites/c2cc/disruptive/reboot.robot @@ -10,7 +10,7 @@ Resource ../../../resources/c2cc.resource Suite Setup Setup Suite Teardown Teardown -Test Tags disruptive +Test Tags c2cc disruptive *** Test Cases *** diff --git a/test/suites/c2cc/upgrade/upgrade-c2cc.robot b/test/suites/c2cc/upgrade/upgrade-c2cc.robot index 662499309d..a3a933471d 100644 --- a/test/suites/c2cc/upgrade/upgrade-c2cc.robot +++ b/test/suites/c2cc/upgrade/upgrade-c2cc.robot @@ -12,7 +12,7 @@ Library SSHLibrary Suite Setup Setup Suite Teardown Teardown -Test Tags c2cc ostree +Test Tags c2cc ostree upgrade *** Variables ***