X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=0202fbe0d0e86f51c797255829627e6ee51fdfbe;hb=ebd0c7defaffdd6cd3ff2b5f580c86601917a0c7;hp=f07997dfc339b1c6ec3c559d354527818a0ba281;hpb=6d105d22e67c3bedf54e6bbb904cb8eb4f05e5f6;p=csit.git

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index f07997dfc3..0202fbe0d0 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)
@@ -431,7 +429,7 @@ function select_tags () {
                 # in Robot Framework.
                 test_tag_array=("mrrANDnic_intel-x710AND1cAND64bANDip4base"
                                 "mrrANDnic_intel-x710AND1cAND78bANDip6base"
-                                "mrrANDnic_intel-x710AND1cAND64bANDl2bdbase"
+                                "mrrANDnic_intel-x710AND1cAND64bANDl2bdbaseANDbase"
                                 "mrrANDnic_intel-x710AND1cAND64bANDl2xcbase")
             else
                 # If trigger contains tags, split them into array.
@@ -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")
+            ;;
+        *)
+            # Default to 3n-hsw due to compatibility.
+            test_tag_array+=("!drv_avf")
+            ;;
+    esac
+
     # We will add excluded NICs.
     test_tag_array+=("${exclude_nics[@]/#/!NIC_}")
 
@@ -487,7 +502,7 @@ function select_topology () {
                         "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed2.yaml"
                         "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed3.yaml"
                        )
-            TOPOLOGIES_TAGS="3_node_*_link_topo"
+            TOPOLOGIES_TAGS="3_node_single_link_topo"
             ;;
         "2n_skx")
             TOPOLOGIES=(