PYBOT_ARGS="-W 150 -L TRACE"
-ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml output_perf_data.json)
+JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
+LOG_ARCHIVE_ARTIFACTS=(output.xml)
+LOG_ARCHIVES_DIR="$WORKSPACE/archives"
+mkdir -p ${LOG_ARCHIVES_DIR}
# If we run this script from CSIT jobs we want to use stable vpp version
if [[ ${JOB_NAME} == csit-* ]] ;
mkdir vpp_download
cd vpp_download
- if [[ ${TEST_TAG} == *NIGHTLY ]] || \
- [[ ${TEST_TAG} == *DAILY ]] || \
+ if [[ ${TEST_TAG} == *DAILY ]] || \
[[ ${TEST_TAG} == *WEEKLY ]];
then
# Download the latest VPP build .deb install packages
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
--include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \
+ --include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \
tests/
RETURN_STATUS=$(echo $?)
+ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log
+ done
;;
PERFTEST_SEMI_WEEKLY )
pybot ${PYBOT_ARGS} \
--include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \
tests/
RETURN_STATUS=$(echo $?)
+ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log
+ done
;;
VERIFY-PERF-NDRDISC )
pybot ${PYBOT_ARGS} \
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 $?)
+ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log
+ done
;;
VERIFY-PERF-IP4 )
pybot ${PYBOT_ARGS} \
tests/
RETURN_STATUS=$(echo $?)
;;
+ VERIFY-PERF-IPSECHW )
+ pybot ${PYBOT_ARGS} \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s "tests.vpp.perf.crypto" \
+ --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 $?)
;;
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 $?)
;;
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 $?)
;;
-s "tests.vpp.perf" \
--include pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif \
--include pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif \
+ --include mrrANDnic_intel-x520-da2AND1t1cANDmemif \
+ --include mrrANDnic_intel-x520-da2AND2t2cANDmemif \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
- PERFTEST_LONG )
+ VPP-VERIFY-PERF-IPSECHW )
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "tests.vpp.perf" \
- --exclude SKIP_PATCH \
- -i NDRPDRDISC \
+ -s "tests.vpp.perf.crypto" \
+ --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \
+ --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \
tests/
RETURN_STATUS=$(echo $?)
;;
- PERFTEST_SHORT )
+ PERFTEST_LONG )
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- -i NDRCHK \
+ --exclude SKIP_PATCH \
+ -i NDRPDRDISC \
tests/
RETURN_STATUS=$(echo $?)
;;
- PERFTEST_NIGHTLY )
- #run all available tests
+ PERFTEST_SHORT )
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
+ -i MRR \
tests/
RETURN_STATUS=$(echo $?)
;;
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
+for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done