X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-weekly.sh;h=6f5ae6fbe23a324b72420251111d4481b330a8ba;hp=738be3479223bdd59cff0c8366792ad8db27ff1f;hb=b641b5bf12a0d1b63ac9afb7c89133297d3b63fe;hpb=47b807e7268231b35982dc3b5a0c3108537d6432 diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index 738be34792..6f5ae6fbe2 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -59,13 +59,15 @@ if [ "${#}" -ne "0" ]; then echo ${arr[0]} else # Download the specific VPP build install packages - DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER) - VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO}) - bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \ - --skip-install --vpp ${VPP_STABLE_VER} --dkms ${DPDK_STABLE_VER} + VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO}) + CSIT_DIR=${SCRIPT_DIR} + source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh" + download_artifacts + # Need to revert -euo as the rest of script is not optimized for this. + set +euo pipefail fi -VIRL_DIR_LOC="/tmp" +VIRL_DIR_LOC="/tmp/" VPP_PKGS=(vpp*.$PACKAGE) VPP_PKGS_FULL=("${VPP_PKGS[@]/#/${VIRL_DIR_LOC}}") echo ${VPP_PKGS[@]} @@ -149,7 +151,7 @@ done # Copy the files to VIRL host scp ${SSH_OPTIONS} ${VPP_PKGS[@]} \ - ${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/ + ${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC} result=$? if [ "${result}" -ne "0" ]; then