aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/bash/function/common.sh8
l---------resources/libraries/bash/function/mrr-daily-tx2.txt1
-rw-r--r--resources/libraries/python/PapiExecutor.py2
3 files changed, 4 insertions, 7 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index e576f99d8d..89c8f31914 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -800,11 +800,9 @@ function select_tags () {
test_tag_array+=("!drv_avf")
;;
*"3n-tsh"*)
+ # 3n-tsh only has x520 NICs which don't work with AVF
+ test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
- test_tag_array+=("!memif")
- test_tag_array+=("!srv6_proxy")
- test_tag_array+=("!vhost")
- test_tag_array+=("!vts")
;;
*"3n-hsw"*)
# TODO: Introduce NOIOMMU version of AVF tests.
@@ -905,7 +903,7 @@ function select_topology () {
;;
"3n_tsh")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
- TOPOLOGIES_TAGS="3_node_*_link_topo"
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
*)
# No falling back to 3n_hsw default, that should have been done
diff --git a/resources/libraries/bash/function/mrr-daily-tx2.txt b/resources/libraries/bash/function/mrr-daily-tx2.txt
deleted file mode 120000
index addc759369..0000000000
--- a/resources/libraries/bash/function/mrr-daily-tx2.txt
+++ /dev/null
@@ -1 +0,0 @@
-mrr-daily.txt \ No newline at end of file
diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py
index 77732c7b05..a3f2479cff 100644
--- a/resources/libraries/python/PapiExecutor.py
+++ b/resources/libraries/python/PapiExecutor.py
@@ -193,7 +193,7 @@ class PapiSocketExecutor(object):
# We need to create instance before removing from sys.path.
cls.cached_vpp_instance = vpp_class(
use_socket=True, server_address="TBD", async_thread=False,
- read_timeout=6, logger=FilteredLogger(logger, "INFO"))
+ read_timeout=14, logger=FilteredLogger(logger, "INFO"))
# Cannot use loglevel parameter, robot.api.logger lacks support.
# TODO: Stop overriding read_timeout when VPP-1722 is fixed.
finally: