X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=826faaa294756fba0c23b6b9fa7ffe7765e986c4;hp=b891bff6469c193e604b22331353fb53f2d2ba2b;hb=8a33e14f1bc9492ac53dda85e9f92b426b27a9bf;hpb=fd005636dc0a164987bad411fc3fa8318928f903

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index b891bff646..826faaa294 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -15,9 +15,9 @@
 set -x
 
 # 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"
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -28,7 +28,7 @@ VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL)
 RESERVATION_DIR="/tmp/reservation_dir"
 INSTALLATION_DIR="/tmp/install_dir"
 
-PYBOT_ARGS="-W 150 --noncritical PERFTEST --exclude SKIP_PATCH"
+PYBOT_ARGS="-W 150 --noncritical PERFTEST"
 
 ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
 
@@ -118,6 +118,8 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s "tests.perf" \
+              --exclude SKIP_PATCH \
               -i perftest_long \
               tests/
         RETURN_STATUS=$(echo $?)
@@ -126,6 +128,7 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s "tests.perf" \
               -i perftest_short \
               tests/
         RETURN_STATUS=$(echo $?)
@@ -134,7 +137,7 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s "performance.Long_Bridge_Domain*" \
+              -s "tests.perf.Long_Bridge_Domain*" \
               tests/
         RETURN_STATUS=$(echo $?)
         ;;
@@ -142,7 +145,7 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s "performance.Long_IPv4*" \
+              -s "tests.perf.Long_IPv4*" \
               tests/
         RETURN_STATUS=$(echo $?)
         ;;
@@ -150,7 +153,7 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s "performance.Long_IPv6*" \
+              -s "tests.perf.Long_IPv6*" \
               tests/
         RETURN_STATUS=$(echo $?)
         ;;
@@ -158,7 +161,7 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s "performance.Long_Xconnect*" \
+              -s "tests.perf.Long_Xconnect*" \
               tests/
         RETURN_STATUS=$(echo $?)
         ;;
@@ -166,14 +169,14 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s "performance.Long_Xconnect_Dot1q*" \
+              -s "tests.perf.Long_Xconnect_Dot1q*" \
         RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_NDR )
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance -i NDR \
+              -s "tests.perf" -i NDR \
               tests/
         RETURN_STATUS=$(echo $?)
         ;;
@@ -181,7 +184,16 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance -i PDR \
+              -s "tests.perf" -i PDR \
+              tests/
+        RETURN_STATUS=$(echo $?)
+        ;;
+   PERFTEST_NIGHTLY )
+        #run all available tests
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s "tests.perf" \
               tests/
         RETURN_STATUS=$(echo $?)
         ;;
@@ -190,7 +202,7 @@ case "$TEST_TAG" in
         pybot ${PYBOT_ARGS} \
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance \
+              -s "tests.perf" \
               tests/
         RETURN_STATUS=$(echo $?)
 esac