CSIT-181: Remove fds tests from vpp-csit-verify and csit-vpp-verify jobs

[csit.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 99842c6..7c2611d 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -111,8 +111,8 @@ if [ "${#}" -ne "0" ]; then
     echo ${arr[0]}
 else
     rm -f *.deb
     echo ${arr[0]}
 else
     rm -f *.deb

-    VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_MASTER_STABLE_VER)
-    VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_MASTER_REPO_URL)
+    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
     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


@@ -189,15 +189,14 @@ virtualenv --system-site-packages env
 . env/bin/activate
 
 echo pip install
 . env/bin/activate
 
 echo pip install

-pip install -r requirements.txt
+pip install -r ${SCRIPT_DIR}/requirements.txt

 
 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
 
 
 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
     echo "Topology schema validation failed."
     echo "However, the tests will start."
 fi


@@ -207,5 +206,6 @@ PYTHONPATH=`pwd` pybot -L TRACE \
     --include vm_envAND3_node_single_link_topo \
     --include vm_envAND3_node_double_link_topo \
     --exclude PERFTEST \
     --include vm_envAND3_node_single_link_topo \
     --include vm_envAND3_node_double_link_topo \
     --exclude PERFTEST \

+    --exclude SKIP_PATCH \

     --noncritical EXPECTED_FAILING \
     tests/
     --noncritical EXPECTED_FAILING \
     tests/