X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fscripts%2Fdelete-heat-stack.sh;h=6bbe9d35c08dc852295f131c90b6d942959301b1;hb=refs%2Fchanges%2F20%2F6220%2F1;hp=5a9f8d5fcb20a6134501db8756dc146e96dcbbb4;hpb=ed20702e9777c2b2400dee2946b54a1ae0cdb5e6;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/scripts/delete-heat-stack.sh b/jjb/cloud-infra/scripts/delete-heat-stack.sh
index 5a9f8d5f..6bbe9d35 100755
--- a/jjb/cloud-infra/scripts/delete-heat-stack.sh
+++ b/jjb/cloud-infra/scripts/delete-heat-stack.sh
@@ -27,27 +27,23 @@ if [[ "$DELETE_STACK" != "true" || "$HW_TYPE" != "cloud" ]]; then
   exit 0
 fi
 
-# NOTE (fdegir): offline installer removes /opt/engine so we prepare venv ourselves for openstack cli
-if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
-  sudo /bin/rm -rf /opt/engine/.venv
-  virtualenv --python python3 --never-download /opt/engine/.venv
-  /bin/cp -f /opt/engine/offline/pip/pip.conf /opt/engine/.venv/
-  set +u
-  source /opt/engine/.venv/bin/activate
-  set -u
-  pip install --quiet --upgrade pip
-  pip install --quiet -r /opt/engine/offline/git/engine/requirements.txt
-  deactivate
-fi
-
+# NOTE (fdegir): install openstack clients
+sudo /bin/rm -rf /tmp/.engine_venv
+virtualenv --python python3 --never-download /tmp/.engine_venv
+# NOTE (fdegir): we need to use pip.conf pointing to local packages
+[[ "$EXECUTION_MODE" == "offline-deployment" ]] && /bin/cp -f /opt/engine/offline/pip/pip.conf /tmp/.engine_venv
 set +u
-source /opt/engine/.venv/bin/activate
+source /tmp/.engine_venv/bin/activate
 set -u
+pip install --quiet --upgrade pip
+# NOTE (fdegir): we only install what is needed rather than all dependencies
+pip install --quiet openstacksdk python-openstackclient python-heatclient
 
+# NOTE (fdegir): delete stack
 echo "Info: Deleting stack $HEAT_STACK_NAME and keypair $KEYPAIR_NAME"
 echo "-------------------------------------------------------------------------"
 source /tmp/openrc && /bin/rm -f /tmp/openrc
-openstack stack delete $HEAT_STACK_NAME --wait --yes
+openstack stack delete  --wait --yes $HEAT_STACK_NAME
 openstack keypair delete $KEYPAIR_NAME
 echo "-------------------------------------------------------------------------"
 echo "Info: Stack $HEAT_STACK_NAME and keypair $KEYPAIR_NAME have been deleted!"