X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-semiweekly.sh;h=7f41dbf4344369e154555b3d7281470532458494;hp=4f7c67333f93950649e16d53ed682268c1accef3;hb=8aed285bf13782990c97348f30b1b265a48af81f;hpb=8a38a84dceac843151d3e5c9367667999638ab10 diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh index 4f7c67333f..7f41dbf434 100644 --- a/bootstrap-vpp-verify-semiweekly.sh +++ b/bootstrap-vpp-verify-semiweekly.sh @@ -87,6 +87,9 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" +VIRL_TOPOLOGY=double-ring-nested.xenial +VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6 + SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" function ssh_do() { @@ -194,9 +197,9 @@ function stop_virl_simulation { VIRL_SID=$(ssh ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER} \ - "start-testcase -c double-ring-nested ${VPP_DEBS_VIRL[@]}") + "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_VIRL[@]}") retval=$? -if [ "$?" -ne "0" ]; then +if [ ${retval} -ne "0" ]; then echo "VIRL simulation start failed" exit ${retval} fi @@ -218,7 +221,7 @@ scp ${SSH_OPTIONS} \ topologies/enabled/topology_VIRL.yaml retval=$? -if [ "$?" -ne "0" ]; then +if [ ${retval} -ne "0" ]; then echo "Failed to copy topology file from VIRL simulation" exit ${retval} fi