aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap-vpp-verify-weekly.sh
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-02-27 15:05:42 +0100
committerPeter Mikus <pmikus@cisco.com>2017-03-01 12:42:58 +0000
commit62f5f53bd82933eb03a037dbcb7820be269dc4e2 (patch)
tree8c8ff590022f35d94339fb2c094b1f13f3cf4bd6 /bootstrap-vpp-verify-weekly.sh
parent933f6fd1af59ffede0f1e51ca67b6913fb9a27e8 (diff)
Use common files to store distro related data for VIRL
- use separate files to store VIRL topology file and VIRL image file version information per distro - read content of appropriate files in all affected bootstrap files Change-Id: I5297ddd610af6a719efaf5792ced12efab35fc7a Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'bootstrap-vpp-verify-weekly.sh')
-rw-r--r--bootstrap-vpp-verify-weekly.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index c04db572d2..cc9c548b17 100644
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -25,18 +25,20 @@ VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
if [ -f "/etc/redhat-release" ]; then
DISTRO="CENTOS"
sudo yum install -y python-devel python-virtualenv
- VIRL_TOPOLOGY=double-ring-nested.centos7
- VIRL_RELEASE=csit-centos-7.3-1611_2017-02-14_1.3
+ VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
+ VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
else
DISTRO="UBUNTU"
export DEBIAN_FRONTEND=noninteractive
sudo apt-get -y update
sudo apt-get -y install libpython2.7-dev python-virtualenv
- VIRL_TOPOLOGY=double-ring-nested.xenial
- VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-20_1.7
+ VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
+ VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
fi
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@ -114,8 +116,6 @@ do
done
# Temporarily download VPP and DPDK packages from nexus.fd.io
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
case "$DISTRO" in
CENTOS )
VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins"