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-342 Update T-rex version to v2.07
[csit.git]
/
bootstrap-verify-perf.sh
diff --git
a/bootstrap-verify-perf.sh
b/bootstrap-verify-perf.sh
index
4dc0c7e
..
826faaa
100755
(executable)
--- a/
bootstrap-verify-perf.sh
+++ b/
bootstrap-verify-perf.sh
@@
-15,12
+15,14
@@
set -x
# Space separated list of available testbeds, described by topology files
set -x
# Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed1
-X710-X520
.yaml \
- topologies/available/lf_testbed2
-X710-X520
.yaml \
- topologies/available/lf_testbed3
-X710-X520
.yaml"
+TOPOLOGIES="topologies/available/lf_testbed1.yaml \
+ topologies/available/lf_testbed2.yaml \
+ topologies/available/lf_testbed3.yaml"
-VPP_STABLE_VER="16.09-rc0~85-gc71c426~b252_amd64"
-VPP_REPO_URL="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.trusty.main/io/fd/vpp/"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER)
+VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL)
# Reservation dir
RESERVATION_DIR="/tmp/reservation_dir"
# Reservation dir
RESERVATION_DIR="/tmp/reservation_dir"
@@
-56,9
+58,8
@@
else
exit 1
fi
exit 1
fi
-CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
WORKING_TOPOLOGY=""
WORKING_TOPOLOGY=""
-export PYTHONPATH=${
CUR
_DIR}
+export PYTHONPATH=${
SCRIPT
_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
@@
-73,7
+74,7
@@
pip install -r requirements.txt
while :; do
for TOPOLOGY in ${TOPOLOGIES};
do
while :; do
for TOPOLOGY in ${TOPOLOGIES};
do
- python ${
CUR
_DIR}/resources/tools/topo_reservation.py -t ${TOPOLOGY}
+ python ${
SCRIPT
_DIR}/resources/tools/topo_reservation.py -t ${TOPOLOGY}
if [ $? -eq 0 ]; then
WORKING_TOPOLOGY=${TOPOLOGY}
echo "Reserved: ${WORKING_TOPOLOGY}"
if [ $? -eq 0 ]; then
WORKING_TOPOLOGY=${TOPOLOGY}
echo "Reserved: ${WORKING_TOPOLOGY}"
@@
-93,15
+94,15
@@
while :; do
done
function cancel_all {
done
function cancel_all {
- python ${
CUR
_DIR}/resources/tools/topo_installation.py -c -d ${INSTALLATION_DIR} -t $1
- python ${
CUR
_DIR}/resources/tools/topo_reservation.py -c -t $1
+ python ${
SCRIPT
_DIR}/resources/tools/topo_installation.py -c -d ${INSTALLATION_DIR} -t $1
+ python ${
SCRIPT
_DIR}/resources/tools/topo_reservation.py -c -t $1
}
# On script exit we cancel the reservation and installation and delete all vpp
# packages
trap "cancel_all ${WORKING_TOPOLOGY}" EXIT
}
# On script exit we cancel the reservation and installation and delete all vpp
# packages
trap "cancel_all ${WORKING_TOPOLOGY}" EXIT
-python ${
CUR
_DIR}/resources/tools/topo_installation.py -t ${WORKING_TOPOLOGY} \
+python ${
SCRIPT
_DIR}/resources/tools/topo_installation.py -t ${WORKING_TOPOLOGY} \
-d ${INSTALLATION_DIR} \
-p ${VPP_DEBS}
if [ $? -eq 0 ]; then
-d ${INSTALLATION_DIR} \
-p ${VPP_DEBS}
if [ $? -eq 0 ]; then
@@
-117,6
+118,8
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s "tests.perf" \
+ --exclude SKIP_PATCH \
-i perftest_long \
tests/
RETURN_STATUS=$(echo $?)
-i perftest_long \
tests/
RETURN_STATUS=$(echo $?)
@@
-125,6
+128,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s "tests.perf" \
-i perftest_short \
tests/
RETURN_STATUS=$(echo $?)
-i perftest_short \
tests/
RETURN_STATUS=$(echo $?)
@@
-133,7
+137,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "
performance
.Long_Bridge_Domain*" \
+ -s "
tests.perf
.Long_Bridge_Domain*" \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-141,7
+145,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "
performance
.Long_IPv4*" \
+ -s "
tests.perf
.Long_IPv4*" \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-149,7
+153,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "
performance
.Long_IPv6*" \
+ -s "
tests.perf
.Long_IPv6*" \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-157,7
+161,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "
performance
.Long_Xconnect*" \
+ -s "
tests.perf
.Long_Xconnect*" \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-165,14
+169,14
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "
performance
.Long_Xconnect_Dot1q*" \
+ -s "
tests.perf
.Long_Xconnect_Dot1q*" \
RETURN_STATUS=$(echo $?)
;;
PERFTEST_NDR )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
RETURN_STATUS=$(echo $?)
;;
PERFTEST_NDR )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s
performance
-i NDR \
+ -s
"tests.perf"
-i NDR \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-180,7
+184,16
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance -i PDR \
+ -s "tests.perf" -i PDR \
+ tests/
+ RETURN_STATUS=$(echo $?)
+ ;;
+ PERFTEST_NIGHTLY )
+ #run all available tests
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s "tests.perf" \
tests/
RETURN_STATUS=$(echo $?)
;;
tests/
RETURN_STATUS=$(echo $?)
;;
@@
-189,7
+202,7
@@
case "$TEST_TAG" in
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s
performance
\
+ -s
"tests.perf"
\
tests/
RETURN_STATUS=$(echo $?)
esac
tests/
RETURN_STATUS=$(echo $?)
esac
@@
-197,12
+210,12
@@
esac
# Pybot output post-processing
echo Post-processing test data...
# 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.xml \
+python ${
SCRIPT
_DIR}/resources/tools/robot_output_parser.py \
+ -i ${
SCRIPT
_DIR}/output.xml \
+ -o ${
SCRIPT
_DIR}/output_perf_data.xml \
-v ${VPP_STABLE_VER}
if [ ! $? -eq 0 ]; then
-v ${VPP_STABLE_VER}
if [ ! $? -eq 0 ]; then
- echo "Parsing ${
CUR
_DIR}/output.xml failed"
+ echo "Parsing ${
SCRIPT
_DIR}/output.xml failed"
fi
# Archive artifacts
fi
# Archive artifacts