Skip to content

Commit 439c860

Browse files
committed
MLE-12345 Trying 2.2.0 Docker tag
1 parent 7733458 commit 439c860

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ def setupDockerMarkLogic(String image){
2424
docker pull '''+image+'''
2525
MARKLOGIC_IMAGE='''+image+''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
2626
echo "Waiting for MarkLogic server to initialize."
27-
sleep 60s
27+
sleep 120s
2828
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2929
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
30-
./gradlew mlTestConnections
30+
./gradlew hackingAround mlTestConnections
3131
./gradlew -i mlDeploy mlReloadSchemas
3232
'''
3333
}
@@ -167,7 +167,7 @@ pipeline{
167167
}
168168
}
169169
steps {
170-
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
170+
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless-qa:12.0.0-ubi-rootless-2.1.3")
171171
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
172172
export JAVA_HOME=$JAVA_HOME_DIR
173173
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -250,7 +250,7 @@ pipeline{
250250
}
251251
}
252252
steps {
253-
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
253+
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless-qa:12.0.0-ubi-rootless-2.1.3")
254254
junit '**/build/**/TEST*.xml'
255255
}
256256
post {

test-app/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ dependencies {
1313
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
1414
}
1515

16+
tasks.register("hackingAround") {
17+
doLast {
18+
println "Admin password: ${project.findProperty('mlPassword') ?: 'not set'}"
19+
}
20+
}
21+
1622
// See https://github.com/psxpaul/gradle-execfork-plugin for docs.
1723
// Note that the task will stop at the end of the build by default, which is typically the behavior we want when
1824
// running tests.

0 commit comments

Comments
 (0)