MLE-24230 Added wait function

Same approach as in the ragplus project, though waiting for up to 2 minutes. Also echo'ing each request so we can look at the logs afterward in Jenkins to see how long we're typically having to wait.

Author: rjrudin

Jenkinsfile

@@ -33,8 +33,6 @@ def runDockerCompose(String markLogicDockerImage) {
     cd node-client-api
     echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''"
     MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build
-    echo "Waiting 90s for MarkLogic to be ready to accept connections"
-    sleep 90s;
 	'''
 }
 
@@ -57,6 +55,22 @@ def runAuditReport() {
 	'''
 }
 
+def waitUntilMarkLogicIsReady() {
+  script {
+    timeout(time: 120, unit: 'SECONDS') {
+      waitUntil(initialRecurrencePeriod: 5000) {
+        try {
+          sh 'echo "Checking if MarkLogic is ready..."'
+          sh 'curl -i --anyauth --user admin:admin -X GET http://localhost:8000/v1/ping'
+          return true
+        } catch(exception){
+          return false
+        }
+      }
+    }
+  }
+}
+
 def runE2ETests() {
   sh label: 'run-e2e-tests', script: '''
     export JAVA_HOME=$JAVA_HOME_DIR
@@ -124,6 +138,7 @@ pipeline {
       steps {
         runAuditReport()
         runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
+        waitUntilMarkLogicIsReady()
         runTests()
         runE2ETests()
       }
@@ -147,6 +162,7 @@ pipeline {
           agent { label 'nodeclientpool' }
           steps {
             runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11')
+            waitUntilMarkLogicIsReady()
             runTests()
             runE2ETests()
           }
@@ -167,6 +183,7 @@ pipeline {
           agent { label 'nodeclientpool' }
           steps {
             runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
+            waitUntilMarkLogicIsReady()
             runTests()
             runE2ETests()
           }
@@ -187,6 +204,7 @@ pipeline {
           agent { label 'nodeclientpool' }
           steps {
             runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
+            waitUntilMarkLogicIsReady()
             runTests()
             runE2ETests()
           }