Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-949: Data models
[csit.git]
/
bootstrap-verify-perf.sh
diff --git
a/bootstrap-verify-perf.sh
b/bootstrap-verify-perf.sh
index
e2d37e2
..
584dea6
100755
(executable)
--- a/
bootstrap-verify-perf.sh
+++ b/
bootstrap-verify-perf.sh
@@
-27,7
+27,10
@@
INSTALLATION_DIR="/tmp/install_dir"
PYBOT_ARGS="-W 150 -L TRACE"
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-* ]] ;
# If we run this script from CSIT jobs we want to use stable vpp version
if [[ ${JOB_NAME} == csit-* ]] ;
@@
-35,8
+38,7
@@
then
mkdir vpp_download
cd vpp_download
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
[[ ${TEST_TAG} == *WEEKLY ]];
then
# Download the latest VPP build .deb install packages
@@
-140,6
+142,9
@@
case "$TEST_TAG" in
--include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \
tests/
RETURN_STATUS=$(echo $?)
--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} \
;;
PERFTEST_SEMI_WEEKLY )
pybot ${PYBOT_ARGS} \
@@
-148,6
+153,9
@@
case "$TEST_TAG" in
--include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \
tests/
RETURN_STATUS=$(echo $?)
--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} \
;;
VERIFY-PERF-NDRDISC )
pybot ${PYBOT_ARGS} \
@@
-165,21
+173,29
@@
case "$TEST_TAG" in
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
- VERIFY-PERF-
NDRCHK
)
+ VERIFY-PERF-
MRR
)
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- --include
ndrchkAND1t1cORndrchk
AND2t2c \
+ --include
mrrAND1t1cORmrr
AND2t2c \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
- PERFTEST_
NDRCHK
_DAILY )
+ PERFTEST_
MRR
_DAILY )
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- --include ndrchkAND1t1cORndrchkAND2t2c \
+ --include mrrAND64bAND1t1c \
+ --include mrrAND64bAND2t2c \
+ --include mrrAND64bAND4t4c \
+ --include mrrAND78bAND1t1c \
+ --include mrrAND78bAND2t2c \
+ --include mrrAND78bAND4t4c \
tests/
RETURN_STATUS=$(echo $?)
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} \
;;
VERIFY-PERF-IP4 )
pybot ${PYBOT_ARGS} \
@@
-241,15
+257,15
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf.crypto" \
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf.crypto" \
- --include
pdrdiscANDnic_intel-xl710AND1t1cANDipsechwANDbase
\
- --include
pdrdiscANDnic_intel-xl710AND2t2cANDipsechwANDbase
\
+ --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" \
tests/
;;
VPP-VERIFY-PERF-IP4 )
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- --include
pdrchkANDnic_intel-x520-da2AND1t1cANDip4baseORpdrchk
ANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \
+ --include
mrrANDnic_intel-x520-da2AND1t1cANDip4baseORmrr
ANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-257,7
+273,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- --include
pdrchkANDnic_intel-x520-da2AND1t1cANDip6baseORpdrchk
ANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \
+ --include
mrrANDnic_intel-x520-da2AND1t1cANDip6baseORmrr
ANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-265,7
+281,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
- --include
pdrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORpdrchk
ANDnic_intel-x520-da2AND1t1cANDl2bdbase \
+ --include
mrrANDnic_intel-x520-da2AND1t1cANDl2xcbaseORmrr
ANDnic_intel-x520-da2AND1t1cANDl2bdbase \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-299,6
+315,8
@@
case "$TEST_TAG" in
-s "tests.vpp.perf" \
--include pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif \
--include pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif \
-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 $?)
;;
@@
-315,8
+333,8
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf.crypto" \
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf.crypto" \
- --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw
ANDbase
\
- --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw
ANDbase
\
+ --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \
+ --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-333,15
+351,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "tests.vpp.perf" \
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 $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-365,17
+375,9
@@
if [ ! $? -eq 0 ]; then
echo "Parsing ${SCRIPT_DIR}/output.xml failed"
fi
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
# 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
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done