X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fdelete-heat-stack.sh;h=efec47b77b0af7f076304a79e25d4c9dec599618;hb=f2b51873a346fec4e1709c4bf3e60dff76431c12;hp=912fdfc05808c014b1a92556609b5b85225c3303;hpb=9ff44dfa77e955e8b99213c62d0cefc195fcaf11;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index 912fdfc0..efec47b7 100644
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -21,21 +21,51 @@
 set -o errexit
 set -o nounset
 
-# stack name to delete
-export STACK_NAME=nordix-onap-custom
+# 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 "-------------------------------------------------------------------------"
+echo "Info: Please wait while deleting the stack and do not abort the job!"
+echo "-------------------------------------------------------------------------"
+echo
+echo
 
 cd $WORKSPACE
-sudo apt install -y 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
-echo "Info: Deleting stack $STACK_NAME"
+pip install -q openstacksdk python-openstackclient python-heatclient
+echo "Info: Deleting stack $STACK_NAME and keypair $KEYPAIR_NAME"
 echo "-------------------------------------------------------------------------"
-source $OPENRC_FILE
+source /tmp/openrc && /bin/rm -f /tmp/openrc
 openstack stack delete $STACK_NAME --wait --yes
+openstack keypair delete $KEYPAIR_NAME
 echo "-------------------------------------------------------------------------"
-echo "Info: Stack $STACK_NAME has been deleted!"
+echo "Info: Stack $STACK_NAME and keypair $KEYPAIR_NAME have been deleted!"
 
 # vim: set ts=2 sw=2 expandtab: