X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=1f5acd3b2e00f45c114234a1cba3d26055b15bfd;hp=fedfa0876ce9c46cbdf68af6eb8225d7d1a03c8d;hb=f5d642c744148481e835226fd27077ccdb342378;hpb=41e49466711459177fde9b9b46425caa608ac23f

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index fedfa0876c..1f5acd3b2e 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -15,7 +15,10 @@
 set -x
 
 # Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml"
+TOPOLOGIES="topologies/available/lf_testbed1-X710-X520.yaml \
+            topologies/available/lf_testbed2-X710-X520.yaml \
+            topologies/available/lf_testbed3-X710-X520.yaml"
+
 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"
 
@@ -25,6 +28,8 @@ INSTALLATION_DIR="/tmp/install_dir"
 
 PYBOT_ARGS="--noncritical MULTI_THREAD"
 
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.json)
+
 # If we run this script from CSIT jobs we want to use stable vpp version
 if [[ ${JOB_NAME} == csit-* ]] ;
 then
@@ -110,40 +115,73 @@ fi
 case "$TEST_TAG" in
     # run specific performance tests based on jenkins job type variable
     PERFTEST_LONG )
-        pybot -L TRACE \
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -i perftest_long \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_SHORT )
-        pybot -L TRACE \
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -i perftest_short \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_BRIDGE )
-        pybot -L TRACE \
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_Bridge_Domain*" \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_IPV4 )
-        pybot -L TRACE \
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_IPv4*" \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_IPV6 )
-        pybot -L TRACE \
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_IPv6*" \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_XCONNECT )
-        pybot -L TRACE \
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_Xconnect*" \
               tests/
+        RETURN_STATUS=$(echo $?)
+        ;;
+    PERFTEST_LONG_XCONNECT_DOT1Q )
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s "performance.Long_Xconnect_Dot1q*" \
+        ;;
+    PERFTEST_NDR )
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s performance -i NDR \
+              tests/
+        ;;
+    PERFTEST_PDR )
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s performance -i PDR \
+              tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     * )
         # run full performance test suite and exit on fail
@@ -152,5 +190,26 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s performance \
               tests/
+        RETURN_STATUS=$(echo $?)
 esac
 
+# Pybot output post-processing
+echo Post-processing test data...
+
+python ${CUR_DIR}/resources/tools/robot_output_parser.py \
+       -i ${CUR_DIR}/output.xml \
+       -o ${CUR_DIR}/output_perf_data.json \
+       -v ${VPP_STABLE_VER}
+if [ ! $? -eq 0 ]; then
+    echo "Parsing ${CUR_DIR}/output.xml failed"
+fi
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+    cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done
+
+echo Post-processing finished.
+
+exit ${RETURN_STATUS}