X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fnolabs%2Fhandle-booking.sh;fp=jjb%2Fnolabs%2Fhandle-booking.sh;h=4b011027d49ced4005531d6e39e081fa60cc3f4d;hb=02ae5ecdada3dfeb982f74eae9a0dadfa5d766b4;hp=cb6786dd37c8bc8f3b24c033bdd7881758ed62c9;hpb=064206a2e1302f5a6141212be5bf2df5f4df55f5;p=infra%2Fcicd.git diff --git a/jjb/nolabs/handle-booking.sh b/jjb/nolabs/handle-booking.sh index cb6786dd..4b011027 100644 --- a/jjb/nolabs/handle-booking.sh +++ b/jjb/nolabs/handle-booking.sh @@ -22,7 +22,7 @@ echo "API Request: http --ignore-stdin POST $NOLABS_API_TOKENS_ENDPOINT --auth d NOLABS_TOKEN=$(http --ignore-stdin POST $NOLABS_API_TOKENS_ENDPOINT --auth $NOLABS_API_USERNAME:$NOLABS_API_PASSWORD | jq -r '.token') 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 "status_text=deploying" \ - "Authorization:Bearer $NOLABS_TOKEN" + "Authorization:Bearer $NOLABS_TOKEN" # get ssh public key of the user echo "API Request: http GET $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID | jq -r '.user_id'" @@ -50,8 +50,7 @@ ENGINE_VERSION=$(git rev-parse HEAD) cd $WORKSPACE/.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=10.10.10.10 +FLOATING_IP=$(cat .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'" @@ -59,16 +58,16 @@ NOLABS_TOKEN=$(http --ignore-stdin POST $NOLABS_API_TOKENS_ENDPOINT --auth $NOLA # update booking echo "API Request: http --ignore-stdin PUT $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID \ - \"Authorization:Bearer DUMMY_TOKEN\" \ - status_text=active \ + \"Authorization:Bearer DUMMY_TOKEN\" \ + status_text=active \ floating_ip=$FLOATING_IP \ heat_stack_name=$STACK_NAME \ scenario_deploy_log_url=${BUILD_URL}consoleFull \ engine_version=$ENGINE_VERSION \ scenario_version=$SCENARIO_VERSION" http --ignore-stdin PUT $NOLABS_API_BOOKINGS_ENDPOINT/$BOOKING_ID \ - "Authorization:Bearer $NOLABS_TOKEN" \ - status_text=active \ + "Authorization:Bearer $NOLABS_TOKEN" \ + status_text=active \ floating_ip=$FLOATING_IP \ heat_stack_name=$STACK_NAME \ scenario_deploy_log_url=${BUILD_URL}consoleFull \