aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap-ubuntu.sh
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-02-20 19:25:30 +0100
committerJan Gelety <jgelety@cisco.com>2017-02-21 16:18:24 +0100
commit8ef4983395b46a834e3ffe712197ec2e2f2b50d1 (patch)
treeba2891762e92e09271d92c02509aa5057f66f1c9 /bootstrap-ubuntu.sh
parentd92228369549613e2547c35f11e4bc2ab009d5ca (diff)
Fix of centos bootstrap and dut_setup.sh
Change-Id: I9fc3a74bf6356bdccee16c977df86567e91b4acf Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'bootstrap-ubuntu.sh')
-rwxr-xr-xbootstrap-ubuntu.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap-ubuntu.sh b/bootstrap-ubuntu.sh
index 7eeb68113c..b860231f0e 100755
--- a/bootstrap-ubuntu.sh
+++ b/bootstrap-ubuntu.sh
@@ -29,7 +29,7 @@ VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_TOPOLOGY=double-ring-nested.xenial
-VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6
+VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-20_1.7
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@ -126,8 +126,8 @@ done
echo "Selected VIRL servers: ${VIRL_SERVER[@]}"
# Temporarily download VPP and DPDK packages from nexus.fd.io
-DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER)
-VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL)
+DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER)_amd64
+VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL_UBUNTU)
VPP_CLASSIFIER="-deb"
if [ "${#}" -ne "0" ]; then
arr=(${@})
@@ -137,7 +137,7 @@ if [ "${#}" -ne "0" ]; then
wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${DPDK_STABLE_VER}/vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
else
rm -f *.deb
- VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER)
+ VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_UBUNTU)
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