Necessary changes for CSIT stable/1606 branch

- use correct URL in VPP_REPO_URL
- use correct VPP build version in VPP_STABLE_VER
- use correct release repo in download_install_vpp_pkgs.sh

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

diff --git a/VPP_REPO_URL b/VPP_REPO_URL
new file mode 100644 (file)
index 0000000..5fdf897
--- /dev/null
+++ b/VPP_REPO_URL
@@ -0,0 +1 @@
+https://nexus.fd.io/content/repositories/fd.io.stable.1606.ubuntu.trusty.main/io/fd/vpp/

diff --git a/VPP_STABLE_VER b/VPP_STABLE_VER
new file mode 100644 (file)
index 0000000..f35ad8f
--- /dev/null
+++ b/VPP_STABLE_VER
@@ -0,0 +1 @@
+16.06-rc3~8-g584b99a~b33_amd64

diff --git a/bootstrap.sh b/bootstrap.sh
index c75f527..09b75cd 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_STABLE_VER)
+    VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_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
@@ -188,11 +189,11 @@ virtualenv --system-site-packages env
 . env/bin/activate
 
 echo pip install
-pip install -r requirements.txt
+pip install -r ${SCRIPT_DIR}/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 \

diff --git a/resources/tools/download_install_vpp_pkgs.sh b/resources/tools/download_install_vpp_pkgs.sh
index 20a1ae4..79224fe 100755 (executable)
--- a/resources/tools/download_install_vpp_pkgs.sh
+++ b/resources/tools/download_install_vpp_pkgs.sh
@@ -20,7 +20,7 @@ trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR
 
 URL="https://nexus.fd.io/service/local/artifact/maven/content"
 VER="RELEASE"
-REPO="fd.io.master.ubuntu.trusty.main"
+REPO="fd.io.stable.1606.ubuntu.trusty.main"
 GROUP="io.fd.vpp"
 ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib"
 PACKAGE="deb deb.md5"