X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=1eb071665473110b642e7a0697efd48ac7df2af7;hp=ee80247e014a094eea429659587ab9ad52127f8e;hb=411b4dfab6252c55d8235afaf3d1324b50b61f00;hpb=5eb99d868051556dce3d509545d130971d74e1fa

diff --git a/bootstrap.sh b/bootstrap.sh
index ee80247e01..1eb0716654 100755
--- 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~33-g4b46c84~b200_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,23 +189,24 @@ 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=$?
-if [ "${result}" -ne "0" ]; then
+if [ "$?" -ne "0" ]; then
     echo "Topology schema validation failed."
     echo "However, the tests will start."
 fi
 
-PYTHONPATH=`pwd` pybot -L TRACE \
-    -v TOPOLOGY_PATH:topologies/enabled/topology.yaml \
+PYTHONPATH=`pwd` pybot -L TRACE -W 150 \
+    -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
+    --suite "tests.func" \
     --include vm_envAND3_node_single_link_topo \
     --include vm_envAND3_node_double_link_topo \
     --exclude PERFTEST \
+    --exclude SKIP_PATCH \
     --noncritical EXPECTED_FAILING \
     tests/