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-114: Eliminate repeated download of PIP packages
[csit.git]
/
bootstrap-verify-perf.sh
diff --git
a/bootstrap-verify-perf.sh
b/bootstrap-verify-perf.sh
index
8662026
..
925e3a6
100755
(executable)
--- a/
bootstrap-verify-perf.sh
+++ b/
bootstrap-verify-perf.sh
@@
-64,7
+64,7
@@
export PYTHONPATH=${CUR_DIR}
sudo apt-get -y update
sudo apt-get -y install libpython2.7-dev python-virtualenv
sudo apt-get -y update
sudo apt-get -y install libpython2.7-dev python-virtualenv
-virtualenv env
+virtualenv
--system-site-packages
env
. env/bin/activate
echo pip install
. env/bin/activate
echo pip install
@@
-120,6
+120,7
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_long \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_long \
tests/
+ RETURN_STATUS=$(echo $?)
;;
PERFTEST_SHORT )
pybot ${PYBOT_ARGS} \
;;
PERFTEST_SHORT )
pybot ${PYBOT_ARGS} \
@@
-127,6
+128,7
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_short \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_short \
tests/
+ RETURN_STATUS=$(echo $?)
;;
PERFTEST_LONG_BRIDGE )
pybot ${PYBOT_ARGS} \
;;
PERFTEST_LONG_BRIDGE )
pybot ${PYBOT_ARGS} \
@@
-134,6
+136,7
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_Bridge_Domain*" \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_Bridge_Domain*" \
tests/
+ RETURN_STATUS=$(echo $?)
;;
PERFTEST_LONG_IPV4 )
pybot ${PYBOT_ARGS} \
;;
PERFTEST_LONG_IPV4 )
pybot ${PYBOT_ARGS} \
@@
-141,6
+144,7
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_IPv4*" \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_IPv4*" \
tests/
+ RETURN_STATUS=$(echo $?)
;;
PERFTEST_LONG_IPV6 )
pybot ${PYBOT_ARGS} \
;;
PERFTEST_LONG_IPV6 )
pybot ${PYBOT_ARGS} \
@@
-148,6
+152,7
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_IPv6*" \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_IPv6*" \
tests/
+ RETURN_STATUS=$(echo $?)
;;
PERFTEST_LONG_XCONNECT )
pybot ${PYBOT_ARGS} \
;;
PERFTEST_LONG_XCONNECT )
pybot ${PYBOT_ARGS} \
@@
-155,14
+160,29
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_Xconnect*" \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_Xconnect*" \
tests/
+ RETURN_STATUS=$(echo $?)
;;
PERFTEST_LONG_XCONNECT_DOT1Q )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_Xconnect_Dot1q*" \
;;
PERFTEST_LONG_XCONNECT_DOT1Q )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s "performance.Long_Xconnect_Dot1q*" \
+ ;;
+ PERFTEST_NDR )
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance -i NDR \
tests/
;;
tests/
;;
+ PERFTEST_PDR )
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance -i PDR \
+ tests/
+ RETURN_STATUS=$(echo $?)
+ ;;
* )
# run full performance test suite and exit on fail
pybot ${PYBOT_ARGS} \
* )
# run full performance test suite and exit on fail
pybot ${PYBOT_ARGS} \
@@
-170,9
+190,12
@@
case "$TEST_TAG" in
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s performance \
tests/
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-s performance \
tests/
+ RETURN_STATUS=$(echo $?)
esac
# Pybot output post-processing
esac
# Pybot output post-processing
+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 \
python ${CUR_DIR}/resources/tools/robot_output_parser.py \
-i ${CUR_DIR}/output.xml \
-o ${CUR_DIR}/output_perf_data.json \
@@
-187,3
+210,6
@@
for i in ${ARCHIVE_ARTIFACTS[@]}; do
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done
+echo Post-processing finished.
+
+exit ${RETURN_STATUS}