case "${TEST_CODE}" in
*"3n-hsw"*)
test_tag_array+=("!drv_avf")
+ test_tag_array+=("!ipsechwNOTnic_intel-xl710")
;;
*"2n-skx"*)
test_tag_array+=("!ipsechw")
;;
*"3n-skx"*)
test_tag_array+=("!ipsechw")
+ # Not enough nic_intel-xxv710 to support double link tests.
+ test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
;;
*"3n-tsh"*)
test_tag_array+=("!ipsechw")
# We will prefix with perftest to prevent running other tests
# (e.g. Functional).
prefix="perftestAND"
+ set +x
if [[ "${TEST_CODE}" == "vpp-"* ]]; then
# Automatic prefixing for VPP jobs to limit the NIC used and
# traffic evaluation to MRR.
- prefix="${prefix}mrrAND${DEFAULT_NIC}AND"
+ if [[ "${TEST_TAG_STRING-}" == *"nic_"* ]]; then
+ prefix="${prefix}mrrAND"
+ else
+ prefix="${prefix}mrrAND${DEFAULT_NIC}AND"
+ fi
fi
for tag in "${test_tag_array[@]}"; do
if [[ "${tag}" == "!"* ]]; then
TAGS+=("${prefix}${tag}")
fi
done
+ set -x
}
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
"1n_vbox")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/vpp_device.template"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"1n_skx")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/vpp_device.template"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"2n_skx")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_2n_skx_testbed21.yaml"
- #"${TOPOLOGIES_DIR}/lf_2n_skx_testbed22.yaml"
- "${TOPOLOGIES_DIR}/lf_2n_skx_testbed23.yaml"
- "${TOPOLOGIES_DIR}/lf_2n_skx_testbed24.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
"3n_skx")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_3n_skx_testbed31.yaml"
- "${TOPOLOGIES_DIR}/lf_3n_skx_testbed32.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
"3n_hsw")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed1.yaml"
- "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed2.yaml"
- "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed3.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_hsw*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
"3n_tsh")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_3n_tsh_testbed33.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
*)