aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/bash/function/common.sh
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-06-06 12:33:20 +0200
committerVratko Polak <vrpolak@cisco.com>2019-06-06 10:34:28 +0000
commit80e06faea73f1574cdb932c25211162121fabd26 (patch)
tree89c2dc68185df0dbcefdf9e1a933dea984915b22 /resources/libraries/bash/function/common.sh
parent060fbf1805a02ec546b238867250d2f19782da55 (diff)
Simplify mrr daily tag expression
The number of tests executed is intentionally smaller, as recently the runtime has gone up too much. New numbers: csit-vpp-perf-mrr-daily-master: 120 csit-vpp-perf-mrr-daily-master-2n-skx: 72 csit-vpp-perf-mrr-daily-master-3n-skx: 126 More details included as diff files. + Less per-testbed exceptions. - Single/double links tags still set at two places. Change-Id: I1149d3e52edf38c7d9d3e0160c533e35ae944d0d Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/bash/function/common.sh')
-rw-r--r--resources/libraries/bash/function/common.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 02c65c82c2..f2aa6820f1 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -659,10 +659,6 @@ function select_tags () {
# Blacklisting certain tags per topology.
case "${TEST_CODE}" in
- *"3n-hsw"*)
- test_tag_array+=("!drv_avf")
- test_tag_array+=("!ipsechwNOTnic_intel-xl710")
- ;;
*"2n-skx"*)
test_tag_array+=("!ipsechw")
;;
@@ -678,9 +674,15 @@ function select_tags () {
test_tag_array+=("!vhost")
test_tag_array+=("!vts")
;;
+ *"3n-hsw"*)
+ # TODO: If AVF tests are expected to fail on haswell,
+ # add (before excluding) an explanation to:
+ # https://github.com/FDio/vpp/blob/master/src/plugins/avf/README.md
+ test_tag_array+=("!ipsechwNOTnic_intel-xl710")
+ ;;
*)
# Default to 3n-hsw due to compatibility.
- test_tag_array+=("!drv_avf")
+ test_tag_array+=("!ipsechwNOTnic_intel-xl710")
;;
esac
@@ -809,6 +811,7 @@ function select_topology () {
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
+ # TODO: Move tags to "# Blacklisting certain tags per topology" section.
"1n_vbox")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"