aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-07-06 11:52:05 +0200
committerJan Gelety <jgelety@cisco.com>2017-07-06 18:09:20 +0000
commitf43b79bdec79e663d644cf76940613168da30d7b (patch)
tree0bd8abb52bf5998c82995c7ce860fcb1af091d4c
parentdcf7d0e5640c048d48b5f6f9cc0aabcd18b4253f (diff)
HC Test: Update script path on bootstrap-hc2vpp-perf.sh
Change-Id: I5ed178448e99465b39267577ae77d79fc8f3f2c2 Signed-off-by: selias <samelias@cisco.com>
-rwxr-xr-xbootstrap-hc2vpp-perf.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap-hc2vpp-perf.sh b/bootstrap-hc2vpp-perf.sh
index 81c80fd375..54efb99903 100755
--- a/bootstrap-hc2vpp-perf.sh
+++ b/bootstrap-hc2vpp-perf.sh
@@ -49,7 +49,7 @@ pip install -r requirements.txt
while :; do
for TOPOLOGY in ${TOPOLOGIES};
do
- python ${SCRIPT_DIR}/resources/tools/topo_reservation.py -t ${TOPOLOGY}
+ python ${SCRIPT_DIR}/resources/tools/scripts/topo_reservation.py -t ${TOPOLOGY}
if [ $? -eq 0 ]; then
WORKING_TOPOLOGY=${TOPOLOGY}
echo "Reserved: ${WORKING_TOPOLOGY}"
@@ -69,8 +69,8 @@ while :; do
done
function cancel_all {
- python ${SCRIPT_DIR}/resources/tools/topo_installation.py -c -d ${INSTALLATION_DIR} -t $1 -hc True
- python ${SCRIPT_DIR}/resources/tools/topo_reservation.py -c -t $1
+ python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py -c -d ${INSTALLATION_DIR} -t $1 -hc True
+ python ${SCRIPT_DIR}/resources/tools/scripts/topo_reservation.py -c -t $1
}
# On script exit we cancel the reservation and installation and delete all vpp
@@ -79,7 +79,7 @@ trap "cancel_all ${WORKING_TOPOLOGY}" EXIT
# Download VPP and HC packages from the current branch
echo Downloading packages...
-bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh ${STREAM} 'ubuntu1604'
+bash ${SCRIPT_DIR}/resources/tools/scripts/download_hc_pkgs.sh ${STREAM} 'ubuntu1604'
if [ "${OS}" == "centos7" ]; then
VPP_PKGS=(*.rpm)
@@ -89,7 +89,7 @@ fi
echo ${VPP_PKGS[@]}
# Install packages
-python ${SCRIPT_DIR}/resources/tools/topo_installation.py -t ${WORKING_TOPOLOGY} \
+python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py -t ${WORKING_TOPOLOGY} \
-d ${INSTALLATION_DIR} \
-p ${VPP_PKGS[@]} \
-hc True