From 638391c368a5539f2b9920a43302254070440a1f Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 25 Sep 2018 11:17:27 +0000 Subject: [PATCH] CSIT-1317 ADD: Ability to blacklist tags per topology - Add option to override some tags per topology. Change-Id: I4045ebbee1c5d32e29cdb6c5c84e0dcd9217b2cf Signed-off-by: Peter Mikus --- resources/libraries/bash/function/common.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 94fd6db174..f3f1b9fcec 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -391,8 +391,6 @@ function select_tags () { # Variables set: # - TAGS - Array of processed tag boolean expressions. - # TODO: Empty exclude_nics (with failing grep) is expected, - # but others possible errors coule be checked explicitly. # NIC SELECTION # All topologies NICs available=$(grep -hoPR "model: \K.*" "${TOPOLOGIES_DIR}"/* | sort -u) @@ -440,6 +438,23 @@ function select_tags () { ;; esac + # Blacklisting certain tags per topology. + case "${TEST_CODE}" in + *"3n-hsw"*) + test_tag_array+=("!drv_avf") + ;; + *"2n-skx"*) + test_tag_array+=("!ipsechw") + ;; + *"3n-skx"*) + test_tag_array+=("!ipsechw") + ;; + *) + # No falling back to 3n_hsw default, that should have been done + # by the function which has set NODENESS and FLAVOR. + die "Unknown specification: ${TEST_CODE}" + esac + # We will add excluded NICs. test_tag_array+=("${exclude_nics[@]/#/!NIC_}") -- 2.16.6