X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=fed5ff74f94a4e963f356e97df23da2e0e83163b;hp=99842c69cc68563ec43f9390f0d5d334b88d1d05;hb=5ed29e1e1c5a76b3c64525e31aca3cf19e2cd5b0;hpb=8be64446049878a0fb4a91a3a8b0481e75b20205

diff --git a/bootstrap.sh b/bootstrap.sh
index 99842c69cc..fed5ff74f9 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -111,8 +111,8 @@ if [ "${#}" -ne "0" ]; then
     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
@@ -189,15 +189,14 @@ 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 ${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