X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=810500eb6bed6e392ba285a44db33f2b7ede9d01;hp=f2aa6820f17940a01df446583ff31b6632a99f72;hb=15bef10b28733e4871459f3ec8c7adbf30e2ff96;hpb=80e06faea73f1574cdb932c25211162121fabd26

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index f2aa6820f1..810500eb6b 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -675,13 +675,19 @@ function select_tags () {
             test_tag_array+=("!vts")
             ;;
         *"3n-hsw"*)
-            # TODO: If AVF tests are expected to fail on haswell,
-            # add (before excluding) an explanation to:
+            # TODO: Introduce NOIOMMU version of AVF tests.
+            # TODO: Make (both) AVF tests work on Haswell,
+            # or document why (some of) it is not possible.
             # https://github.com/FDio/vpp/blob/master/src/plugins/avf/README.md
+            test_tag_array+=("!drv_avf")
+            # All cards have access to QAT. But only one card (xl710)
+            # resides in same NUMA as QAT. Other cards must go over QPI
+            # which we do not want to even run.
             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