X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fnolabs%2Fhandle-booking.sh;h=fe5d29f48ba6f29a2ec055d2b0ed9616884e529c;hb=411ab84bc9692e150ccf6776350a50e96b8ed198;hp=30f82d5f5cd21196be85fb55aeec941f8e7e38ed;hpb=f5e2b33682693e1132fc5c3f2cac5adeac266cb7;p=infra%2Fcicd.git

diff --git a/jjb/nolabs/handle-booking.sh b/jjb/nolabs/handle-booking.sh
index 30f82d5f..fe5d29f4 100644
--- a/jjb/nolabs/handle-booking.sh
+++ b/jjb/nolabs/handle-booking.sh
@@ -8,9 +8,12 @@ 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
+set -u
 pip install httpie > /dev/null
 
 # check if the booking is cancelled or not
@@ -33,11 +36,10 @@ echo "API Request: http GET $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID | jq -r '.
 NOLABS_USER_ID=$(http GET $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID | jq -r '.user_id')
 echo "API Request: http --ignore-stdin GET $NOLABS_API_USERS_ENDPOINT/$NOLABS_USER_ID \"Authorization:Bearer DUMMY_TOKEN\" | jq -r '.ssh_public_key'"
 http --ignore-stdin GET $NOLABS_API_USERS_ENDPOINT/$NOLABS_USER_ID "Authorization:Bearer $NOLABS_TOKEN" | jq -r '.ssh_public_key' > $NOLABS_USER_SSHPUBKEY
-echo "-------------------------------------------------"
-cat $NOLABS_USER_SSHPUBKEY
-echo "-------------------------------------------------"
 
+set +u
 deactivate
+set -u
 # get the specific patch
 cd $WORKSPACE
 git fetch "https://gerrit.nordix.org/infra/engine" $GERRIT_REFSPEC && git checkout FETCH_HEAD
@@ -49,12 +51,14 @@ cd engine
 
 cd $WORKSPACE
 
+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'"