diff options
Diffstat (limited to 'bootstrap-verify-perf.sh')
-rwxr-xr-x | bootstrap-verify-perf.sh | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index c051b58bb7..8dedb530ab 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -165,19 +165,19 @@ case "$TEST_TAG" in tests/ RETURN_STATUS=$(echo $?) ;; - VERIFY-PERF-NDRCHK ) + VERIFY-PERF-MRR ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ + --include mrrAND1t1cORmrrAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NDRCHK_DAILY ) + PERFTEST_MRR_DAILY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ + --include mrrAND1t1cORmrrAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -241,15 +241,15 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf.crypto" \ - --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \ - --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \ + --include ndrdiscANDnic_intel-xl710AND1t1cANDipsechw \ + --include ndrdiscANDnic_intel-xl710AND2t2cANDipsechw \ tests/ ;; VPP-VERIFY-PERF-IP4 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDip4baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ + --include mrrANDnic_intel-x520-da2AND1t1cANDip4baseORmrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -257,7 +257,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDip6baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ + --include mrrANDnic_intel-x520-da2AND1t1cANDip6baseORmrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -265,7 +265,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORpdrchkANDnic_intel-x520-da2AND1t1cANDl2bdbase \ + --include mrrANDnic_intel-x520-da2AND1t1cANDl2xcbaseORmrrANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -333,15 +333,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.vpp.perf" \ - -i NDRCHK \ - tests/ - RETURN_STATUS=$(echo $?) - ;; - PERFTEST_NIGHTLY ) - #run all available tests - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -i MRR \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -365,14 +357,6 @@ 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 -p archive for i in ${ARCHIVE_ARTIFACTS[@]}; do |