X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=8662026dc210164fa001e21c88cb688c82245856;hb=refs%2Fchanges%2F58%2F1258%2F3;hp=de478e5f11af3f45b9feb332a2bbd2fd3cb6b524;hpb=824fb1d6a1d94636d7a73ad6b1fc69fabf8efad7;p=csit.git

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index de478e5f11..8662026dc2 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
@@ -151,6 +156,13 @@ case "$TEST_TAG" in
               -s "performance.Long_Xconnect*" \
               tests/
         ;;
+    PERFTEST_LONG_XCONNECT_DOT1Q )
+        pybot ${PYBOT_ARGS} \
+              -L TRACE \
+              -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+              -s "performance.Long_Xconnect_Dot1q*" \
+              tests/
+        ;;
     * )
         # run full performance test suite and exit on fail
         pybot ${PYBOT_ARGS} \
@@ -160,3 +172,18 @@ case "$TEST_TAG" in
               tests/
 esac
 
+# Pybot output post-processing
+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
+