X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fdelete-heat-stack.sh;h=b732de44601743e61042cc4e8f5f84606356845e;hb=385413ec8a79ff2f7c92f01c2b67885bfc07890c;hp=34ed7ac96bf1ecebbe4aac5ff8f795e9541de4e8;hpb=395f17a48813bd15525e4f1ff683ebe5468827b5;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index 34ed7ac9..b732de44 100644
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -21,6 +21,30 @@
 set -o errexit
 set -o nounset
 
+# proceed only if the deployment is done on openstack
+if [[ $DEPLOY_TYPE != "cloud" ]]; then
+  echo "-------------------------------------------------------------------------"
+  echo "Info: It is not an OpenStack deployment so nothing to delete!"
+  echo "-------------------------------------------------------------------------"
+  exit 0
+fi
+
+# do not delete the stack if not explicitly set to delete
+if [[ "$DELETE_STACK" != "yes" ]]; then
+  echo "-------------------------------------------------------------------------"
+  echo "Info: Stack will not be deleted upon the completion of the job!"
+  echo "-------------------------------------------------------------------------"
+  exit 0
+fi
+
+# k8s and onap scenario have stacks so exit for others
+if [[ ! "$DEPLOY_SCENARIO" =~ ^k8-.*|^onap-.* ]]; then
+  echo "-------------------------------------------------------------------------"
+  echo "Info: Nothing to delete!"
+  echo "-------------------------------------------------------------------------"
+  exit 0
+fi
+
 echo
 echo
 echo "-------------------------------------------------------------------------"
@@ -29,19 +53,16 @@ echo "-------------------------------------------------------------------------"
 echo
 echo
 
-# stack name to delete
-export STACK_NAME=nordix-onap-custom
-
 cd $WORKSPACE
-sudo apt install -y python-dev python-virtualenv
-virtualenv $WORKSPACE/.venv
+sudo apt install -y -qq python-dev python-virtualenv > /dev/null
+virtualenv -q $WORKSPACE/.venv
 set +u
 source $WORKSPACE/.venv/bin/activate
 set -u
-pip install openstacksdk python-openstackclient python-heatclient
+pip install -q openstacksdk python-openstackclient python-heatclient
 echo "Info: Deleting stack $STACK_NAME"
 echo "-------------------------------------------------------------------------"
-source $OPENRC_FILE
+source /tmp/openrc && /bin/rm -f /tmp/openrc
 openstack stack delete $STACK_NAME --wait --yes
 echo "-------------------------------------------------------------------------"
 echo "Info: Stack $STACK_NAME has been deleted!"