nolabs: Bring in engine changes

[infra/cicd.git] / jjb / nolabs / handle-booking.sh

diff --git a/jjb/nolabs/handle-booking.sh b/jjb/nolabs/handle-booking.sh
index fa37ee2696769a278b005d1aa6c3eb87f2d5b1e8..fe5d29f48ba6f29a2ec055d2b0ed9616884e529c 100644 (file)
--- 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'"