X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=e3a79707635dd81fb971e0f658d1ef52f48e6ea7;hp=c9723d422da0c3f6d611379238f66f5f3ef45059;hb=b9edc2d34cf5148684b9a8d49b965756c289fcdb;hpb=bc26996dcd0e92af29e5208cbcecd8d347cf1210 diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index c9723d422d..e3a7970763 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -27,7 +27,7 @@ INSTALLATION_DIR="/tmp/install_dir" PYBOT_ARGS="-W 150 -L TRACE" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml) +ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml output_perf_data.json) # If we run this script from CSIT jobs we want to use stable vpp version if [[ ${JOB_NAME} == csit-* ]] ; @@ -35,7 +35,9 @@ then mkdir vpp_download cd vpp_download - if [[ ${TEST_TAG} == "PERFTEST_NIGHTLY" ]] ; + if [[ ${TEST_TAG} == *NIGHTLY ]] || \ + [[ ${TEST_TAG} == *DAILY ]] || \ + [[ ${TEST_TAG} == *WEEKLY ]]; then # Download the latest VPP build .deb install packages echo Downloading VPP packages... @@ -325,6 +327,14 @@ if [ ! $? -eq 0 ]; then echo "Parsing ${SCRIPT_DIR}/output.xml failed" fi +python ${SCRIPT_DIR}/resources/tools/report_gen/run_robot_json_data.py \ + --input ${SCRIPT_DIR}/output.xml \ + --output ${SCRIPT_DIR}/output_perf_data.json \ + --vdevice ${VPP_STABLE_VER} +if [ ! $? -eq 0 ]; then + echo "Generating JSON data for report from ${SCRIPT_DIR}/output.xml failed" +fi + # Archive artifacts mkdir archive for i in ${ARCHIVE_ARTIFACTS[@]}; do