diff options
| -rwxr-xr-x | bootstrap-verify-perf.sh | 14 | ||||
| -rwxr-xr-x | resources/tools/download_install_vpp_pkgs.sh | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 5416e9cf77..0442464f1e 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -21,9 +21,6 @@ TOPOLOGIES="topologies/available/lf_testbed1.yaml \ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER) -VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL) - # Reservation dir RESERVATION_DIR="/tmp/reservation_dir" INSTALLATION_DIR="/tmp/install_dir" @@ -45,10 +42,13 @@ then bash ${SCRIPT_DIR}/resources/tools/download_install_vpp_pkgs.sh --skip-install VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" - + # Take vpp package and get the vpp version + VPP_STABLE_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )" else + VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL) + VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER) VPP_CLASSIFIER="-deb" - #download vpp build from nexus and set VPP_DEBS variable + # Download vpp build from nexus and set VPP_DEBS variable wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit @@ -64,9 +64,11 @@ then # 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 + # Use local packages provided as argument list # Jenkins VPP deb paths (convert to full path) VPP_DEBS="$( readlink -f $@ | tr '\n' ' ' )" + # Take vpp package and get the vpp version + VPP_STABLE_VER="$( expr match $1 'vpp-\(.*\)-deb.deb' )" else echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}" exit 1 diff --git a/resources/tools/download_install_vpp_pkgs.sh b/resources/tools/download_install_vpp_pkgs.sh index 6da3f86736..67c8362b7e 100755 --- a/resources/tools/download_install_vpp_pkgs.sh +++ b/resources/tools/download_install_vpp_pkgs.sh @@ -27,7 +27,7 @@ if [ -e "$VPP_REPO_URL_PATH" ]; then REPO=$(echo ${VPP_REPO_URL#https://nexus.fd.io/content/repositories/}) REPO=$(echo ${REPO%/io/fd/vpp/}) else - REPO='fd.io.master.ubuntu.trusty.main' + REPO='fd.io.master.ubuntu.xenial.main' fi GROUP="io.fd.vpp" |