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-32: Add decapsulation test
[csit.git]
/
bootstrap-verify-perf.sh
diff --git
a/bootstrap-verify-perf.sh
b/bootstrap-verify-perf.sh
index
8662026
..
4dc0c7e
100755
(executable)
--- a/
bootstrap-verify-perf.sh
+++ b/
bootstrap-verify-perf.sh
@@
-19,16
+19,16
@@
TOPOLOGIES="topologies/available/lf_testbed1-X710-X520.yaml \
topologies/available/lf_testbed2-X710-X520.yaml \
topologies/available/lf_testbed3-X710-X520.yaml"
topologies/available/lf_testbed2-X710-X520.yaml \
topologies/available/lf_testbed3-X710-X520.yaml"
-VPP_STABLE_VER="1
.0.0-437~g8f15e9
2_amd64"
-VPP_REPO_URL="https://nexus.fd.io/
service/local/repositories/fd.io.dev/content/io/fd/vpp
"
+VPP_STABLE_VER="1
6.09-rc0~85-gc71c426~b25
2_amd64"
+VPP_REPO_URL="https://nexus.fd.io/
content/repositories/fd.io.master.ubuntu.trusty.main/io/fd/vpp/
"
# Reservation dir
RESERVATION_DIR="/tmp/reservation_dir"
INSTALLATION_DIR="/tmp/install_dir"
# Reservation dir
RESERVATION_DIR="/tmp/reservation_dir"
INSTALLATION_DIR="/tmp/install_dir"
-PYBOT_ARGS="-
-noncritical MULTI_THREAD
"
+PYBOT_ARGS="-
W 150 --noncritical PERFTEST
"
-ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.
json
)
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.
xml
)
# 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-* ]] ;
@@
-43,7
+43,6
@@
then
wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${VPP_STABLE_VER}/vpp-dpdk-dkms-${VPP_STABLE_VER}.deb" || exit
wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}.deb" || exit
VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )"
wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${VPP_STABLE_VER}/vpp-dpdk-dkms-${VPP_STABLE_VER}.deb" || exit
wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}.deb" || exit
VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )"
- PYBOT_ARGS="${PYBOT_ARGS} --exitonfailure"
cd ..
# If we run this script from vpp project we want to use local build
cd ..
# If we run this script from vpp project we want to use local build
@@
-64,7
+63,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
+119,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
+127,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
+135,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
+143,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
+151,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,13
+159,30
@@
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*" \
+ RETURN_STATUS=$(echo $?)
+ ;;
+ PERFTEST_NDR )
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance -i NDR \
tests/
tests/
+ RETURN_STATUS=$(echo $?)
+ ;;
+ 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
;;
* )
# run full performance test suite and exit on fail
@@
-170,12
+191,15
@@
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 \
python ${CUR_DIR}/resources/tools/robot_output_parser.py \
-i ${CUR_DIR}/output.xml \
- -o ${CUR_DIR}/output_perf_data.
json
\
+ -o ${CUR_DIR}/output_perf_data.
xml
\
-v ${VPP_STABLE_VER}
if [ ! $? -eq 0 ]; then
echo "Parsing ${CUR_DIR}/output.xml failed"
-v ${VPP_STABLE_VER}
if [ ! $? -eq 0 ]; then
echo "Parsing ${CUR_DIR}/output.xml failed"
@@
-187,3
+211,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}