X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fdelete-heat-stack.sh;h=b3239445c1461a2a9381344a81804cdb2e362fb4;hb=cfdc0dea36ea8bdcebd350fbe1953fab4b9c110d;hp=50a6396ed7ccc6ddbc628f7a58efda1662583eda;hpb=af99e7eac1c20fe77a95d1f5755ff48a185733b1;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index 50a6396e..b3239445 100644
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -21,6 +21,29 @@
 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
+
+# we don't support OpenStack scenario verification on OpenStack yet
+if [[ "$DEPLOY_SCENARIO" =~ "os-" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then
+  echo "-------------------------------------------------------------------------"
+  echo "Info: OpenStack scenario verification on OpenStack has not been implemented yet!"
+  echo "-------------------------------------------------------------------------"
+  exit 0
+fi
+
+if [[ "$DELETE_STACK" != "yes" ]]; then
+  echo "-------------------------------------------------------------------------"
+  echo "Info: Stack will not be deleted upon the completion of the job!"
+  echo "-------------------------------------------------------------------------"
+  exit 0
+fi
+
 echo
 echo
 echo "-------------------------------------------------------------------------"
@@ -29,16 +52,13 @@ 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 /tmp/openrc && /bin/rm -f /tmp/openrc