From: Fatih Degirmenci <fdegir@gmail.com>
Date: Sun, 2 Feb 2020 08:01:17 +0000 (+0100)
Subject: nolabs: Bring in engine changes
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=552a75b521a1831f5919aaf53eb6125994fc2243;p=infra%2Fcicd.git

nolabs: Bring in engine changes

Change-Id: Icb34376e83a5e06f321889349d0d0f80be760781
---

diff --git a/jjb/nolabs/delete-booking.sh b/jjb/nolabs/delete-booking.sh
index 9a8050729..42446dd75 100644
--- a/jjb/nolabs/delete-booking.sh
+++ b/jjb/nolabs/delete-booking.sh
@@ -22,8 +22,8 @@ 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 "-------------------------------------------------"
diff --git a/jjb/nolabs/handle-booking.sh b/jjb/nolabs/handle-booking.sh
index fa37ee269..fe5d29f48 100644
--- a/jjb/nolabs/handle-booking.sh
+++ b/jjb/nolabs/handle-booking.sh
@@ -8,7 +8,8 @@ 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
+/bin/rm -rf /opt/engine $NOLABS_VENV
+mkdir -p $NOLABS_VENV
 virtualenv -p python3 $NOLABS_VENV > /dev/null
 set +u
 source $NOLABS_VENV/bin/activate > /dev/null
@@ -54,10 +55,10 @@ set +u
 source $NOLABS_VENV/bin/activate > /dev/null
 set -u
 ENGINE_VERSION=$(git rev-parse HEAD)
-cd $WORKSPACE/.cache/repos/swconfig
+cd /opt/engine/.cache/repos/swconfig
 SCENARIO_VERSION=$(git rev-parse HEAD)
 cd $WORKSPACE
-FLOATING_IP=$(cat .cache/config/inventory.ini | grep 'jumphost ansible_host' | awk '{print $2}' | cut -d'=' -f2)
+FLOATING_IP=$(cat /opt/engine/.cache/config/inventory.ini | grep 'jumphost ansible_host' | awk '{print $2}' | cut -d'=' -f2)
 
 # get authentication token
 echo "API Request: http --ignore-stdin POST $NOLABS_API_TOKENS_ENDPOINT --auth dummy@dummy.com:dummy | jq -r '.token'"