X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-hc2vpp-perf.sh;h=a3531ab7925893289f35033c2028880d51a101fc;hp=1cbf60b8c8f25896b55aa63fdc77b8339cdcd427;hb=e969ed4b0e5ef34525c4b81db51d320ab32f8e10;hpb=0ac66d491ae486ad5d553eecb5aa400ca1fbd9db diff --git a/bootstrap-hc2vpp-perf.sh b/bootstrap-hc2vpp-perf.sh index 1cbf60b8c8..a3531ab792 100755 --- a/bootstrap-hc2vpp-perf.sh +++ b/bootstrap-hc2vpp-perf.sh @@ -19,9 +19,9 @@ OS=$2 ODL=$3 # Space separated list of available testbeds, described by topology files -TOPOLOGIES="topologies/available/lf_testbed1.yaml \ - topologies/available/lf_testbed2.yaml \ - topologies/available/lf_testbed3.yaml" +TOPOLOGIES="topologies/available/lf_3n_hsw_testbed1.yaml \ + topologies/available/lf_3n_hsw_testbed2.yaml \ + topologies/available/lf_3n_hsw_testbed3.yaml" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -84,7 +84,11 @@ trap "cancel_all ${WORKING_TOPOLOGY}" EXIT # Download VPP and HC packages from the current branch echo Downloading packages... -bash ${SCRIPT_DIR}/resources/tools/scripts/download_hc_pkgs.sh ${STREAM} 'ubuntu1604' +CSIT_DIR=${SCRIPT_DIR} +source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh" +source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts_hc.sh" +download_artifacts +download_artifacts_hc if [ "${OS}" == "centos7" ]; then VPP_PKGS=(*.rpm)