Skip to content

Commit e6de797

Browse files
committed
Create gradle-local.properties file in the root directory also
1 parent 2c48903 commit e6de797

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

Jenkinsfile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ def setupDockerMarkLogic(String image){
1919
sudo /usr/local/sbin/mladmin cleandata
2020
cd java-client-api/test-app
2121
docker compose down -v || true
22+
docker volume prune -f
2223
echo "Using image: "'''+image+'''
2324
MARKLOGIC_IMAGE='''+image+''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
2425
echo "mlPassword=admin" > gradle-local.properties
2526
echo "Waiting for MarkLogic server to initialize."
26-
sleep 30s
27+
sleep 60s
2728
cd ..
29+
echo "mlPassword=admin" > gradle-local.properties
2830
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2931
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
32+
./gradlew mlTestConnections
3033
./gradlew -i mlDeploy mlReloadSchemas
3134
'''
3235
}
@@ -180,6 +183,7 @@ pipeline{
180183
sh label:'dockerCleanup', script: '''#!/bin/bash
181184
cd java-client-api/test-app
182185
docker compose down -v || true
186+
docker volume prune -f
183187
'''
184188
}
185189
}
@@ -201,6 +205,15 @@ pipeline{
201205
./gradlew publish
202206
'''
203207
}
208+
post{
209+
always{
210+
sh label:'dockerCleanup', script: '''#!/bin/bash
211+
cd java-client-api/test-app
212+
docker compose down -v || true
213+
docker volume prune -f
214+
'''
215+
}
216+
}
204217
}
205218

206219
stage('regressions-11.2.0') {

0 commit comments

Comments
 (0)