summaryrefslogtreecommitdiffstats
path: root/test/ete/scripts
diff options
context:
space:
mode:
authoreHanan <eoin.hanan@ericsson.com>2018-09-05 14:09:19 +0100
committerGary Wu <gary.i.wu@huawei.com>2018-09-07 11:02:55 -0700
commit97b7a9c998bbb8b31b8b04e7eae5d553bbaed738 (patch)
tree954f9370fa2e0ad828d2fc850b382ef4e3ea972f /test/ete/scripts
parent4d2cfb6d4df3f39d299012be1ed8fdb5b1cf460a (diff)
Deployment Script made more flexible
Change-Id: I8322b85afdd5dfc1a88b7dbf369d3c19399b5b1e Issue-ID: INT-611 Signed-off-by: eHanan <eoin.hanan@ericsson.com> Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'test/ete/scripts')
-rwxr-xr-xtest/ete/scripts/teardown-onap.sh22
1 files changed, 12 insertions, 10 deletions
diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh
index 61e643b64..77b8233fa 100755
--- a/test/ete/scripts/teardown-onap.sh
+++ b/test/ete/scripts/teardown-onap.sh
@@ -14,14 +14,14 @@ while getopts ":rqn:" o; do
if [ $answer = "y" ] || [ $answer = "Y" ] || [ $answer = "yes" ] || [ $answer = "Yes"]; then
echo "This may delete the work of other colleages within the same enviroment"
read -p "Are you certain this is what you want? (type y to confirm):" answer2
-
+
if [ $answer2 = "y" ] || [ $answer2 = "Y" ] || [ $answer2 = "yes" ] || [ $answer2 = "Yes"]; then
full_deletion=true
- else
+ else
echo "Ending program"
exit 1
fi
- else
+ else
echo "Ending program"
exit 1
fi
@@ -46,7 +46,7 @@ fi
source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
-if [ "$full_deletion" = true ];then
+if [ "$full_deletion" = true ];then
echo "Commencing delete, press CRTL-C to stop"
sleep 10
@@ -92,19 +92,21 @@ if [ "$full_deletion" = true ];then
echo "No existing stacks to delete."
fi
-else
- #Restrained teardown
+else
+ #Restrained teardown
echo "Restrained teardown"
-
+
STACK=$install_name
- if [ ! -z "${STACK}" ]; then
+ STATUS=$(openstack stack check $STACK)
+
+ if [ "Stack not found: $install_name" != "$STATUS" ]; then
openstack stack delete $STACK
-
+
until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do
sleep 2
done
else
echo "No existing stack with the name $install_name."
fi
-fi \ No newline at end of file
+fi