X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-honeycomb.sh;h=41bb4db78d1e08593df6175a9282e7fccc72469f;hp=ec7be15f2b56b014215e09d509ac87d2202c3dc8;hb=df5b8e6f57e93a5e96b34b854c07df1668651e14;hpb=7889a8bc03746d41643af32d5514e499df41fb3e

diff --git a/bootstrap-vpp-honeycomb.sh b/bootstrap-vpp-honeycomb.sh
index ec7be15f2b..41bb4db78d 100755
--- a/bootstrap-vpp-honeycomb.sh
+++ b/bootstrap-vpp-honeycomb.sh
@@ -106,12 +106,12 @@ do
     fi
 done
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 # Download the latest VPP and HC .deb packages
 echo Downloading packages...
 bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
 VPP_DEBS=(*.deb)
 echo ${VPP_DEBS[@]}
 VIRL_DIR_LOC="/tmp"
@@ -160,9 +160,9 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "start-testcase ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE}")
+    "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_FULL[@]}")
 retval=$?
-if [ "$?" -ne "0" ]; then
+if [ ${retval} -ne "0" ]; then
     echo "VIRL simulation start failed"
     exit ${retval}
 fi
@@ -184,7 +184,7 @@ scp ${SSH_OPTIONS} \
     topologies/enabled/topology.yaml
 
 retval=$?
-if [ "$?" -ne "0" ]; then
+if [ ${retval} -ne "0" ]; then
     echo "Failed to copy topology file from VIRL simulation"
     exit ${retval}
 fi