X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-semiweekly.sh;h=e7be38c3191be733ae19e991b2d84978a774d838;hp=10f0f9007a831a3790933ee90406a804aa2266e2;hb=43717c90f05596f628cb7ef17cf35a8cf7289f86;hpb=f57f8e4ae0db2fecf9e3bd4d287a36d59348e997

diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index 10f0f9007a..e7be38c319 100644
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -247,6 +247,7 @@ do
 
     pybot -L TRACE \
         -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
+        --suite "tests.func" \
         --include vm_envAND3_node_single_link_topo \
         --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \
@@ -272,9 +273,9 @@ set -x
 echo Making a reservation for the HW system...
 
 # Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed1-X710-X520.yaml \
-            topologies/available/lf_testbed2-X710-X520.yaml \
-            topologies/available/lf_testbed3-X710-X520.yaml"
+TOPOLOGIES="topologies/available/lf_testbed1.yaml \
+            topologies/available/lf_testbed2.yaml \
+            topologies/available/lf_testbed3.yaml"
 
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"
@@ -340,6 +341,7 @@ echo Performance tests on HW system
 pybot ${PYBOT_ARGS} \
     -L TRACE \
     -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+    --suite "tests.perf" \
     --include perftest_long \
     --output log_perf_test_set \
     tests/
@@ -411,8 +413,10 @@ if [ ! $? -eq 0 ]; then
 fi
 
 # Rebot output post-processing
-rebot --output output.xml ./log_func_test_set1.xml ./log_func_test_set2.xml \
-    ./log_func_test_set3.xml ./log_perf_test_set.xml
+rebot --noncritical EXPECTED_FAILING \
+      --output output.xml \
+      ./log_func_test_set1.xml ./log_func_test_set2.xml \
+      ./log_func_test_set3.xml ./log_perf_test_set.xml
 
 # Remove unnecessary files
 rm -f ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml \