diff options
| author |   Tibor Frank <tifrank@cisco.com> | 2016-12-08 13:58:32 +0100 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2016-12-12 06:23:07 +0000 |
| commit | df5b8e6f57e93a5e96b34b854c07df1668651e14 (patch) | |
| tree | b5fc93fb0fdbc02bc08378eb2cf6e5372bc9c22f | |
| parent | eb38a257f3fbecee93a883ddfc62683e49c649a1 (diff) | |
Correct the checking of return values.
Change-Id: Icf9f37e0ab0ce4eef3532d3b18f82e9dc5f8f999
Signed-off-by: Tibor Frank <tifrank@cisco.com>
| -rwxr-xr-x | bootstrap-vpp-honeycomb.sh | 4 | ||||
| -rw-r--r-- | bootstrap-vpp-verify-semiweekly.sh | 4 | ||||
| -rw-r--r-- | bootstrap-vpp-verify-weekly.sh | 4 | ||||
| -rwxr-xr-x | bootstrap.sh | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bootstrap-vpp-honeycomb.sh b/bootstrap-vpp-honeycomb.sh index 66d72b0f87..41bb4db78d 100755 --- a/bootstrap-vpp-honeycomb.sh +++ b/bootstrap-vpp-honeycomb.sh @@ -162,7 +162,7 @@ VIRL_SID=$(ssh ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER} \ "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 diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh index c2ed4ea3e0..e6c48ec909 100644 --- a/bootstrap-vpp-verify-semiweekly.sh +++ b/bootstrap-vpp-verify-semiweekly.sh @@ -199,7 +199,7 @@ VIRL_SID=$(ssh ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER} \ "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 @@ -221,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 diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index 206670476d..8fd6ff2075 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -161,7 +161,7 @@ VIRL_SID=$(ssh ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER} \ "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 @@ -183,7 +183,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 diff --git a/bootstrap.sh b/bootstrap.sh index f3564ecc23..286ec380a2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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 |