From: Jan Gelety <jgelety@cisco.com>
Date: Mon, 27 Feb 2017 14:05:42 +0000 (+0100)
Subject: Use common files to store distro related data for VIRL
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=62f5f53bd82933eb03a037dbcb7820be269dc4e2

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>
---

diff --git a/VIRL_RELEASE_CENTOS b/VIRL_RELEASE_CENTOS
new file mode 100644
index 0000000000..987de2f328
--- /dev/null
+++ b/VIRL_RELEASE_CENTOS
@@ -0,0 +1 @@
+csit-centos-7.3-1611_2017-02-23_1.4
diff --git a/VIRL_RELEASE_UBUNTU b/VIRL_RELEASE_UBUNTU
new file mode 100644
index 0000000000..e686e74c35
--- /dev/null
+++ b/VIRL_RELEASE_UBUNTU
@@ -0,0 +1 @@
+csit-ubuntu-16.04.1_2017-02-23_1.8
diff --git a/VIRL_TOPOLOGY_CENTOS b/VIRL_TOPOLOGY_CENTOS
new file mode 100644
index 0000000000..420817d447
--- /dev/null
+++ b/VIRL_TOPOLOGY_CENTOS
@@ -0,0 +1 @@
+double-ring-nested.centos7
diff --git a/VIRL_TOPOLOGY_UBUNTU b/VIRL_TOPOLOGY_UBUNTU
new file mode 100644
index 0000000000..7b5fef7146
--- /dev/null
+++ b/VIRL_TOPOLOGY_UBUNTU
@@ -0,0 +1 @@
+double-ring-nested.xenial
diff --git a/bootstrap-centos.sh b/bootstrap-centos.sh
index 2f3ac19ddd..85e3dd42a6 100755
--- a/bootstrap-centos.sh
+++ b/bootstrap-centos.sh
@@ -26,16 +26,16 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
-VIRL_TOPOLOGY=double-ring-nested.centos7
-VIRL_RELEASE=csit-centos-7.3-1611_2017-02-23_1.4
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
+VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
 TEST_GROUPS=("l2bd,dhcp,gre,honeycomb,l2xc,lisp,softwire" "cop,telemetry,ipsec,ipv6,rpf,tap,vrf" "fds,iacl,ipv4,policer,vlan,vxlan")
 SUITE_PATH="tests.func"
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
 # Create tmp dir
 mkdir ${SCRIPT_DIR}/tmp
 
diff --git a/bootstrap-ubuntu.sh b/bootstrap-ubuntu.sh
index b6872cb044..9363c55aa3 100755
--- a/bootstrap-ubuntu.sh
+++ b/bootstrap-ubuntu.sh
@@ -28,16 +28,16 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
-VIRL_TOPOLOGY=double-ring-nested.xenial
-VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-23_1.8
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
+VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
 TEST_GROUPS=("l2bd,dhcp,gre,honeycomb,l2xc,lisp,softwire" "cop,telemetry,ipsec,ipv6,rpf,tap,vrf" "fds,iacl,ipv4,policer,vlan,vxlan")
 SUITE_PATH="tests.func"
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
 # Create tmp dir
 mkdir ${SCRIPT_DIR}/tmp
 
diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index b0402e0e3e..c3fc4e0ac6 100644
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -107,12 +107,12 @@ VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
 case "$DISTRO" in
         CENTOS )
-            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)
             ;;
         UBUNTU )
-            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)
 esac
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
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"