Introduce FLOATING_IP variable

.gitlab-ci.yml

@@ -85,9 +85,11 @@ build_image:
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
         PKR_VAR_image_name="ood-PR-${CI_MERGE_REQUEST_ID}"
         echo OOD_INSTANCE_NAME="ood-PR-${CI_MERGE_REQUEST_ID}" | tee -a $CI_PROJECT_DIR/image.env
+        echo FLOATING_IP=$(openstack floating ip create uab-campus -f value -c floating_ip_address) | tee -a $CI_PROJECT_DIR/image.env
       elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
         PKR_VAR_image_name="ood-${BUILD_DATE}"
         echo OOD_INSTANCE_NAME="ood-knightly" | tee -a $CI_PROJECT_DIR/image.env
+        echo FLOATING_IP=$TEST_IP | tee -a $CI_PROJECT_DIR/image.env
       fi
     - >
       PKR_VAR_build_instance_name="ood-${CRI_XCBC_HEAD}"
@@ -141,13 +143,13 @@ test:
       --wait
       $OOD_INSTANCE_NAME)
     - echo NEW_INSTANCE_ID=$NEW_INSTANCE_ID | tee -a instance.env
-    - openstack server add floating ip $NEW_INSTANCE_ID $TEST_IP
+    - openstack server add floating ip $NEW_INSTANCE_ID $FLOATING_IP
     - >
-      curl --retry 10 --retry-delay 20 --retry-connrefused https://knightly.rc.uab.edu/Shibboleth.sso/Metadata --resolve knightly.rc.uab.edu:443:$TEST_IP -kf
+      curl --retry 10 --retry-delay 20 --retry-connrefused https://knightly.rc.uab.edu/Shibboleth.sso/Metadata --resolve knightly.rc.uab.edu:443:$FLOATING_IP -kf
       || (openstack server delete $NEW_INSTANCE_ID && openstack image delete $BUILT_OOD_IMAGE_ID && false)
     - |
       if [ $CI_PIPELINE_SOURCE = "schedule" ]; then
-        openstack server remove floating ip $NEW_INSTANCE_ID $TEST_IP
+        openstack server remove floating ip $NEW_INSTANCE_ID $FLOATING_IP
       else
         openstack server delete $NEW_INSTANCE_ID
         openstack image delete $BUILT_OOD_IMAGE_ID