Skip to content

USHIFT-7298: Consistent tag-based test selection in c2cc scenarios #7028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vimauro wants to merge 1 commit into from
Closed

USHIFT-7298: Consistent tag-based test selection in c2cc scenarios #7028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions test/bin/c2cc_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -318,6 +324,7 @@ c2cc_run_tests() {
${target_ref_var} \
${dual_cidr_vars} \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
${include_args} \
"${suites_dir}"
}

Expand Down
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el102-src@c2cc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el98-src@c2cc-disruptive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el98-src@c2cc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/scenarios-bootc/c2cc/el98-src@el102-src@c2cc-upgrade-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/cleanup.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Resource ../../../resources/c2cc.resource
Suite Setup Setup
Suite Teardown Teardown

Test Tags c2cc
Test Tags c2cc basic


*** Variables ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/connectivity.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/custom-route-tables.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Resource ../../../resources/c2cc.resource
Suite Setup Setup
Suite Teardown Teardown

Test Tags c2cc
Test Tags c2cc basic


*** Variables ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/dns.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/healthcheck.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/infrastructure.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/probe.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/reconciliation.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/basic/sanity.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/disruptive/disruptive.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/disruptive/reboot.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Resource ../../../resources/c2cc.resource
Suite Setup Setup
Suite Teardown Teardown

Test Tags disruptive
Test Tags c2cc disruptive


*** Test Cases ***
Expand Down
2 changes: 1 addition & 1 deletion test/suites/c2cc/upgrade/upgrade-c2cc.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Library SSHLibrary
Suite Setup Setup
Suite Teardown Teardown

Test Tags c2cc ostree
Test Tags c2cc ostree upgrade


*** Variables ***
Expand Down