aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap-hw-tb2.sh98
-rwxr-xr-xbootstrap-verify-perf.sh84
2 files changed, 84 insertions, 98 deletions
diff --git a/bootstrap-hw-tb2.sh b/bootstrap-hw-tb2.sh
index 46cd3f0c84..5da9630e9c 100755
--- a/bootstrap-hw-tb2.sh
+++ b/bootstrap-hw-tb2.sh
@@ -14,89 +14,17 @@
set -x
-# space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml"
-
-CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-WORKING_TOPOLOGY=""
-export PYTHONPATH=${CUR_DIR}
-
-sudo apt-get -y update
-sudo apt-get -y install libpython2.7-dev python-virtualenv
-
-virtualenv env
-. env/bin/activate
-
-echo pip install
-pip install -r requirements.txt
-
-# we iterate over available topologies and wait until we reserve topology
-while :; do
- for TOPOLOGY in ${TOPOLOGIES};
- do
- python ${CUR_DIR}/resources/tools/topo_reservation.py -t ${TOPOLOGY}
- if [ $? -eq 0 ]; then
- WORKING_TOPOLOGY=${TOPOLOGY}
- echo "Reserved: ${WORKING_TOPOLOGY}"
- break
- fi
- done
-
- if [ ! -z "${WORKING_TOPOLOGY}" ]; then
- # exit the infinite while loop if we made a reservation
- break
- fi
-
- # wait 10 - 30 sec. before next try
- SLEEP_TIME=$[ ( $RANDOM % 20 ) + 10 ]s
- echo "Sleeping ${SLEEP_TIME}"
- sleep ${SLEEP_TIME}
-done
-
-function cancel_reservation {
- python ${CUR_DIR}/resources/tools/topo_reservation.py -c -t $1
-}
-
-# on script exit we cancel the reservation
-trap "cancel_reservation ${WORKING_TOPOLOGY}" EXIT
-
-case "$TEST_TAG" in
- # run specific performance tests based on jenkins job type variable
- PERFTEST_LONG )
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -i perftest_long \
- tests/
- ;;
- PERFTEST_SHORT )
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -i perftest_short \
- tests/
- ;;
- PERFTEST_LONG_BRIDGE )
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance.long_bridge_domain \
- tests/
- ;;
- PERFTEST_LONG_IPV4 )
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance.long_ipv4 \
- tests/
- ;;
- PERFTEST_LONG_XCONNECT )
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance.long_xconnect \
- tests/
- ;;
- * )
- # run full performance test suite
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance \
- tests/
-esac
+#TODO: remove this file after changing csit-vpp-verify job configuration
+if [ ! -e bootstrap-verify-perf.sh ]
+then
+ echo 'ERROR: No bootstrap-verify-perf.sh found'
+ exit 1
+fi
+
+# make sure that bootstrap-verify-perf.sh is executable
+chmod +x bootstrap-verify-perf.sh
+# run the script
+./bootstrap-verify-perf.sh *.deb
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index 042d44ed4b..739cda45e7 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -16,13 +16,41 @@ set -x
# Space separated list of available testbeds, described by topology files
TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml"
+VPP_STABLE_VER="1.0.0-304~gd530445_amd64"
+VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.dev/content/io/fd/vpp"
# Reservation dir
RESERVATION_DIR="/tmp/reservation_dir"
INSTALLATION_DIR="/tmp/install_dir"
-# Jenkins VPP deb paths (convert to full path)
-VPP_DEBS="$( readlink -f $@ | tr '\n' ' ' )"
+PYBOT_ARGS=""
+
+# If we run this script from CSIT jobs we want to use stable vpp version
+if [[ ${JOB_NAME} == csit-* ]] ;
+then
+ mkdir vpp_download
+ cd vpp_download
+ #download vpp build from nexus and set VPP_DEBS variable
+ wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}.deb" || exit
+ wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}.deb" || exit
+ wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}.deb" || exit
+ wget -q "${VPP_REPO_URL}/vpp-dpdk-dev/${VPP_STABLE_VER}/vpp-dpdk-dev-${VPP_STABLE_VER}.deb" || exit
+ 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
+elif [[ ${JOB_NAME} == vpp-* ]] ;
+then
+ #use local packages provided as argument list
+ # Jenkins VPP deb paths (convert to full path)
+ VPP_DEBS="$( readlink -f $@ | tr '\n' ' ' )"
+else
+ echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}"
+ exit 1
+fi
CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
WORKING_TOPOLOGY=""
@@ -79,14 +107,44 @@ else
exit 1
fi
-if [ ! -z "$TEST_TAG" ]; then
-# run specific performance tests by tag if variable is set
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -i "${TEST_TAG,,}" tests/
-else
-# run full performance test suite
- pybot -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s performance tests/
-fi
+case "$TEST_TAG" in
+ # run specific performance tests based on jenkins job type variable
+ PERFTEST_LONG )
+ pybot -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -i perftest_long \
+ tests/
+ ;;
+ PERFTEST_SHORT )
+ pybot -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -i perftest_short \
+ tests/
+ ;;
+ PERFTEST_LONG_BRIDGE )
+ pybot -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance.long_bridge_domain \
+ tests/
+ ;;
+ PERFTEST_LONG_IPV4 )
+ pybot -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance.long_ipv4 \
+ tests/
+ ;;
+ PERFTEST_LONG_XCONNECT )
+ pybot -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance.long_xconnect \
+ tests/
+ ;;
+ * )
+ # run full performance test suite and exit on fail
+ pybot ${PYBOT_ARGS} \
+ -L TRACE \
+ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+ -s performance \
+ tests/
+esac
+