Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PERF bootstrap, apply global PYBOT args to all test types
[csit.git]
/
bootstrap-verify-perf.sh
diff --git
a/bootstrap-verify-perf.sh
b/bootstrap-verify-perf.sh
index
f1b58ab
..
de478e5
100755
(executable)
--- a/
bootstrap-verify-perf.sh
+++ b/
bootstrap-verify-perf.sh
@@
-16,7
+16,7
@@
set -x
# Space separated list of available testbeds, described by topology files
TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml"
# Space separated list of available testbeds, described by topology files
TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml"
-VPP_STABLE_VER="1.0.0-
369~g106f0ed
_amd64"
+VPP_STABLE_VER="1.0.0-
437~g8f15e92
_amd64"
VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.dev/content/io/fd/vpp"
# Reservation dir
VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.dev/content/io/fd/vpp"
# Reservation dir
@@
-82,8
+82,8
@@
while :; do
break
fi
break
fi
- # Wait
10 - 30 sec.
before next try
- SLEEP_TIME=$[ ( $RANDOM % 20 ) + 10 ]s
+ # Wait
~3minutes
before next try
+ SLEEP_TIME=$[ ( $RANDOM % 20 ) + 1
8
0 ]s
echo "Sleeping ${SLEEP_TIME}"
sleep ${SLEEP_TIME}
done
echo "Sleeping ${SLEEP_TIME}"
sleep ${SLEEP_TIME}
done
@@
-110,33
+110,45
@@
fi
case "$TEST_TAG" in
# run specific performance tests based on jenkins job type variable
PERFTEST_LONG )
case "$TEST_TAG" in
# run specific performance tests based on jenkins job type variable
PERFTEST_LONG )
- pybot -L TRACE \
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_long \
tests/
;;
PERFTEST_SHORT )
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_long \
tests/
;;
PERFTEST_SHORT )
- pybot -L TRACE \
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_short \
tests/
;;
PERFTEST_LONG_BRIDGE )
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-i perftest_short \
tests/
;;
PERFTEST_LONG_BRIDGE )
- pybot -L TRACE \
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s
performance.long_bridge_domain
\
+ -s
"performance.Long_Bridge_Domain*"
\
tests/
;;
PERFTEST_LONG_IPV4 )
tests/
;;
PERFTEST_LONG_IPV4 )
- pybot -L TRACE \
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance.long_ipv4 \
+ -s "performance.Long_IPv4*" \
+ tests/
+ ;;
+ PERFTEST_LONG_IPV6 )
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s "performance.Long_IPv6*" \
tests/
;;
PERFTEST_LONG_XCONNECT )
tests/
;;
PERFTEST_LONG_XCONNECT )
- pybot -L TRACE \
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s
performance.long_xconnect
\
+ -s
"performance.Long_Xconnect*"
\
tests/
;;
* )
tests/
;;
* )