X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=2eab51d3ede9307582ec2d5b6c589317183d9fbc;hp=f3564ecc2342d9baae599887584a972c5c525ebe;hb=79b92294d889c5f9243019afd28fe2ab0db0e22e;hpb=4ab17f1d485e858b885f430e8ffe0852602f31c3 diff --git a/bootstrap.sh b/bootstrap.sh index f3564ecc23..2eab51d3ed 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -29,7 +29,7 @@ VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" VIRL_TOPOLOGY=double-ring-nested.xenial -VIRL_RELEASE=csit-ubuntu-16.04.1_2016-11-28_1.5 +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" @@ -169,7 +169,7 @@ for index in "${!VIRL_SERVER[@]}"; do scp ${SSH_OPTIONS} *.deb \ ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ - result=$? + result=$? if [ "${result}" -ne "0" ]; then echo "Failed to copy VPP deb files to VIRL host ${VIRL_SERVER[${index}]}" echo ${result} @@ -199,7 +199,7 @@ for index in "${!VIRL_SERVER[@]}"; do ${VIRL_USERNAME}@${VIRL_SERVER[${index}]} \ "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 on ${VIRL_SERVER[${index}]}" exit ${retval} fi @@ -218,7 +218,7 @@ for index in "${!VIRL_SERVER[@]}"; do topologies/enabled/topology${index}.yaml retval=$? - if [ "$?" -ne "0" ]; then + if [ ${retval} -ne "0" ]; then echo "Failed to copy topology file from VIRL simulation nr. ${index} on VIRL server ${VIRL_SERVER[${index}]}" exit ${retval} fi