MLE-12345 Trying 2.2.0 Docker tag

Author: rjrudin

Jenkinsfile

@@ -24,10 +24,10 @@ def setupDockerMarkLogic(String image){
     docker pull '''+image+'''
     MARKLOGIC_IMAGE='''+image+''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
     echo "Waiting for MarkLogic server to initialize."
-    sleep 60s
+    sleep 120s
 		export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
 		export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
-		./gradlew mlTestConnections
+		./gradlew hackingAround mlTestConnections
    	./gradlew -i mlDeploy mlReloadSchemas
   '''
 }
@@ -167,7 +167,7 @@ pipeline{
         }
       }
       steps {
-	      setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
+	      setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.1.3")
         sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -250,7 +250,7 @@ pipeline{
 				}
 			}
 			steps {
-				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
+				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.1.3")
 				junit '**/build/**/TEST*.xml'
 			}
 			post {

test-app/build.gradle

@@ -13,6 +13,12 @@ dependencies {
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
 
+tasks.register("hackingAround") {
+	doLast {
+		println "Admin password: ${project.findProperty('mlPassword') ?: 'not set'}"
+	}
+}
+
 // See https://github.com/psxpaul/gradle-execfork-plugin for docs.
 // Note that the task will stop at the end of the build by default, which is typically the behavior we want when
 // running tests.