From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 9 Nov 2017 23:44:38 +0000 (-0800)
Subject: Fix wait loop for when stack delete failes
X-Git-Tag: 1.0.0-Amsterdam~36^2~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F23047%2F1;p=integration.git

Fix wait loop for when stack delete failes

Change-Id: Ie564579d9ebf269553c88da5308abb9d28a6b50c
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 5c46785fc..90393cf86 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -13,7 +13,7 @@ if [ ! -z "${STACKS}" ]; then
     echo "Deleting Stacks ${STACKS}"
     openstack stack delete -y $STACKS
     for STACK in ${STACKS}; do
-        until ! openstack stack show -c stack_status -f value $STACK; do
+        until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do
             sleep 30
         done
     done