X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fnolabs%2Fdelete-booking.sh;h=42446dd75fe00123ae6f977db6494b514a8c8a8b;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=5dcea5b46eba7fd725fb052651e08f76c8379ce5;hpb=e921738689626876f05977326bb267e139617b22;p=infra%2Fcicd.git

diff --git a/jjb/nolabs/delete-booking.sh b/jjb/nolabs/delete-booking.sh
index 5dcea5b4..42446dd7 100644
--- a/jjb/nolabs/delete-booking.sh
+++ b/jjb/nolabs/delete-booking.sh
@@ -1,30 +1,43 @@
 #!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
 
 cd $WORKSPACE
 
 # install dependencies
+sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" > /dev/null
 sudo apt install -y virtualenv jq > /dev/null
 /bin/rm -rf $NOLABS_VENV && mkdir -p $NOLABS_VENV
 virtualenv -p python3 $NOLABS_VENV > /dev/null
+set +u
 source $NOLABS_VENV/bin/activate > /dev/null
+set -u
 pip install httpie python-openstackclient python-heatclient python-novaclient > /dev/null
 source /tmp/openrc
 
 export STACK_NAME="nordix-nolabs-booking${BOOKING_ID}-${DEPLOY_SCENARIO}"
+export KEYPAIR_NAME="keypair-${STACK_NAME}"
 echo "Info: STACK_NAME is set to $STACK_NAME"
+echo "Info: KEYPAIR_NAME is set to $KEYPAIR_NAME"
 echo "Info: Deleting stack $STACK_NAME"
 echo "-------------------------------------------------"
-echo openstack stack delete -y --wait $STACK_NAME
-openstack stack delete -y --wait $STACK_NAME
+echo openstack stack delete -y $STACK_NAME
+openstack stack delete -y $STACK_NAME
+echo "-------------------------------------------------"
+echo "Info: Deleting keypair $KEYPAIR_NAME"
+echo "-------------------------------------------------"
+echo openstack keypair delete $KEYPAIR_NAME
+openstack keypair delete $KEYPAIR_NAME
 echo "-------------------------------------------------"
 
 # get authentication token
-echo "API Request: http --ignore-stdin POST http://188.212.108.245/api/tokens --auth dummy@dummy.com:dummy | jq -r '.token'"
-NOLABS_TOKEN=$(http --ignore-stdin POST http://188.212.108.245/api/tokens --auth $NOLABS_API_USERNAME:$NOLABS_API_PASSWORD | jq -r '.token')
+echo "API Request: http --ignore-stdin POST $NOLABS_API_TOKENS_ENDPOINT --auth dummy@dummy.com:dummy | jq -r '.token'"
+NOLABS_TOKEN=$(http --ignore-stdin POST $NOLABS_API_TOKENS_ENDPOINT --auth $NOLABS_API_USERNAME:$NOLABS_API_PASSWORD | jq -r '.token')
 
 # update booking status
 echo "API Request: http --ignore-stdin PUT $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID \"status_text=deploying\" \"Authorization:Bearer DUMMY_TOKEN\""
 http --ignore-stdin PUT $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID \
-	"Authorization:Bearer $NOLABS_TOKEN" \
-	status_text=expired \
-	floating_ip="N/A"
+    "Authorization:Bearer $NOLABS_TOKEN" \
+    status_text=expired \
+    floating_ip="N/A"