X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=c6619f9ea9dc2eb6971ce8a9de91aff7c5061eaf;hp=925e3a6b986c3ff4de3acba16278791f4c91af49;hb=a6c9214784087316c5ca3f19cece3e7f757e84b9;hpb=5eb99d868051556dce3d509545d130971d74e1fa diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 925e3a6b98..c6619f9ea9 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/fd/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-* ]] ; @@ -167,6 +167,7 @@ case "$TEST_TAG" in -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "performance.Long_Xconnect_Dot1q*" \ + RETURN_STATUS=$(echo $?) ;; PERFTEST_NDR ) pybot ${PYBOT_ARGS} \ @@ -174,6 +175,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s performance -i NDR \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_PDR ) pybot ${PYBOT_ARGS} \ @@ -198,7 +200,7 @@ 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"