Use files to store VPP stable build data

- add VPP_REPO_URL file to store path to VPP build repository
- add VPP_STABLE_VER file to store VPP stable build version
- adapt bootstrap*.sh files to read VPP build repository path
  and VPP stable build version from files

Change-Id: I2997320ec3df68eaf092795e5d553fb3f024d366
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/VPP_MASTER_REPO_URL b/VPP_MASTER_REPO_URL
new file mode 100644 (file)
index 0000000..c6fb071
--- /dev/null
+++ b/VPP_MASTER_REPO_URL
@@ -0,0 +1 @@
+https://nexus.fd.io/service/local/repositories/fd.io.master.ubuntu.trusty.main/content/io/fd/vpp

diff --git a/VPP_MASTER_STABLE_VER b/VPP_MASTER_STABLE_VER
new file mode 100644 (file)
index 0000000..f8e30ad
--- /dev/null
+++ b/VPP_MASTER_STABLE_VER
@@ -0,0 +1 @@
+16.09-rc0~65-g30097b5~b232_amd64

diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index 1860429..0b82d38 100644 (file)
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -64,13 +64,15 @@ EOF
 chmod 600 priv_key
 
 # Temporarily download VPP packages from nexus.fd.io
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 rm -f *.deb
 if [ "${#}" -ne "0" ]; then
     arr=(${@})
     echo ${arr[0]}
 else
-    VPP_STABLE_VER="16.09-rc0~47-g3419d0b~b214_amd64"
-    VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.master.ubuntu.trusty.main/content/io/fd/vpp"
+    VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_MASTER_STABLE_VER)
+    VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_MASTER_REPO_URL)
     wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}.deb" || exit
     wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}.deb" || exit
     wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}.deb" || exit
@@ -159,7 +161,7 @@ do
     echo
     echo ${test_set}. test loop
     PYTHONPATH=`pwd` pybot -L TRACE \
-        -v TOPOLOGY_PATH:topologies/enabled/topology.yaml \
+        -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
         --include vm_envAND3_node_single_link_topo \
         --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \

diff --git a/bootstrap.sh b/bootstrap.sh
index c75f527..99842c6 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -104,14 +104,15 @@ do
 done
 
 # Temporarily download VPP packages from nexus.fd.io
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [ "${#}" -ne "0" ]; then
     arr=(${@})
     echo ${arr[0]}
 else
     rm -f *.deb
-    VPP_STABLE_VER="16.09-rc0~47-g3419d0b~b214_amd64"
-    VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.master.ubuntu.trusty.main/content/io/fd/vpp"
+    VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_MASTER_STABLE_VER)
+    VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_MASTER_REPO_URL)
     wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}.deb" || exit
     wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}.deb" || exit
     wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}.deb" || exit
@@ -190,9 +191,9 @@ virtualenv --system-site-packages env
 echo pip install
 pip install -r requirements.txt
 
-pykwalify -s resources/topology_schemas/3_node_topology.sch.yaml \
-          -s resources/topology_schemas/topology.sch.yaml \
-          -d topologies/enabled/topology.yaml \
+pykwalify -s ${SCRIPT_DIR}/resources/topology_schemas/3_node_topology.sch.yaml \
+          -s ${SCRIPT_DIR}/resources/topology_schemas/topology.sch.yaml \
+          -d ${SCRIPT_DIR}/topologies/enabled/topology.yaml \
           -vvv
 
 result=$?
@@ -202,7 +203,7 @@ if [ "${result}" -ne "0" ]; then
 fi
 
 PYTHONPATH=`pwd` pybot -L TRACE \
-    -v TOPOLOGY_PATH:topologies/enabled/topology.yaml \
+    -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
     --include vm_envAND3_node_single_link_topo \
     --include vm_envAND3_node_double_link_topo \
     --exclude PERFTEST \