X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=5ea4277236b5094dfeceade195dc8c2af3f3a860;hp=8662026dc210164fa001e21c88cb688c82245856;hb=0980f57745614ce747040ca5ccfb53d7d117266d;hpb=52913516a16429a0ec6573260cf946223c84f34d

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index 8662026dc2..5ea4277236 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -19,8 +19,8 @@ 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"
+VPP_STABLE_VER="16.09-rc0~85-gc71c426~b252_amd64"
+VPP_REPO_URL="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.trusty.main/io/vpp/"
 
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"
@@ -28,7 +28,7 @@ INSTALLATION_DIR="/tmp/install_dir"
 
 PYBOT_ARGS="--noncritical MULTI_THREAD"
 
-ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.json)
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
 
 # If we run this script from CSIT jobs we want to use stable vpp version
 if [[ ${JOB_NAME} == csit-* ]] ;
@@ -64,7 +64,7 @@ export PYTHONPATH=${CUR_DIR}
 sudo apt-get -y update
 sudo apt-get -y install libpython2.7-dev python-virtualenv
 
-virtualenv env
+virtualenv --system-site-packages env
 . env/bin/activate
 
 echo pip install
@@ -120,6 +120,7 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -i perftest_long \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_SHORT )
         pybot ${PYBOT_ARGS} \
@@ -127,6 +128,7 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -i perftest_short \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_BRIDGE )
         pybot ${PYBOT_ARGS} \
@@ -134,6 +136,7 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_Bridge_Domain*" \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_IPV4 )
         pybot ${PYBOT_ARGS} \
@@ -141,6 +144,7 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_IPv4*" \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_IPV6 )
         pybot ${PYBOT_ARGS} \
@@ -148,6 +152,7 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -s "performance.Long_IPv6*" \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_LONG_XCONNECT )
         pybot ${PYBOT_ARGS} \
@@ -155,13 +160,30 @@ case "$TEST_TAG" in
               -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*" \
+        RETURN_STATUS=$(echo $?)
+        ;;
+    PERFTEST_NDR )
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s performance -i NDR \
               tests/
+        RETURN_STATUS=$(echo $?)
+        ;;
+    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
@@ -170,12 +192,15 @@ 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 \
+       -o ${CUR_DIR}/output_perf_data.xml \
        -v ${VPP_STABLE_VER}
 if [ ! $? -eq 0 ]; then
     echo "Parsing ${CUR_DIR}/output.xml failed"
@@ -187,3 +212,6 @@ for i in ${ARCHIVE_ARTIFACTS[@]}; do
     cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
 done
 
+echo Post-processing finished.
+
+exit ${RETURN_STATUS}