Explicitly list the NIC type for perf tests

[csit.git] / bootstrap-verify-perf.sh

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index 739cda4..fedfa08 100755 (executable)
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -16,14 +16,14 @@ set -x
 
 # Space separated list of available testbeds, described by topology files
 TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml"
-VPP_STABLE_VER="1.0.0-304~gd530445_amd64"
+VPP_STABLE_VER="1.0.0-437~g8f15e92_amd64"
 VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.dev/content/io/fd/vpp"
 
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"
 INSTALLATION_DIR="/tmp/install_dir"
 
-PYBOT_ARGS=""
+PYBOT_ARGS="--noncritical MULTI_THREAD"
 
 # If we run this script from CSIT jobs we want to use stable vpp version
 if [[ ${JOB_NAME} == csit-* ]] ;
@@ -82,8 +82,8 @@ while :; do
         break
     fi
 
-    # Wait 10 - 30 sec. before next try
-    SLEEP_TIME=$[ ( $RANDOM % 20 ) + 10 ]s
+    # Wait ~3minutes before next try
+    SLEEP_TIME=$[ ( $RANDOM % 20 ) + 180 ]s
     echo "Sleeping ${SLEEP_TIME}"
     sleep ${SLEEP_TIME}
 done
@@ -124,19 +124,25 @@ case "$TEST_TAG" in
     PERFTEST_LONG_BRIDGE )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_bridge_domain \
+              -s "performance.Long_Bridge_Domain*" \
               tests/
         ;;
     PERFTEST_LONG_IPV4 )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_ipv4 \
+              -s "performance.Long_IPv4*" \
+              tests/
+        ;;
+    PERFTEST_LONG_IPV6 )
+        pybot -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s "performance.Long_IPv6*" \
               tests/
         ;;
     PERFTEST_LONG_XCONNECT )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_xconnect \
+              -s "performance.Long_Xconnect*" \
               tests/
         ;;
     * )