From f43b79bdec79e663d644cf76940613168da30d7b Mon Sep 17 00:00:00 2001 From: selias Date: Thu, 6 Jul 2017 11:52:05 +0200 Subject: [PATCH] HC Test: Update script path on bootstrap-hc2vpp-perf.sh Change-Id: I5ed178448e99465b39267577ae77d79fc8f3f2c2 Signed-off-by: selias --- bootstrap-hc2vpp-perf.sh | 10 +++++----- 1 file 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 -- 2.16.6