Skip to content

Commit 5920f46

Browse files
committed
MLE-25073 Telling Jenkins to wait longer for MarkLogic
1 parent 37e2724 commit 5920f46

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ def runtests(){
99
export PATH=$JAVA_HOME/bin:$PATH
1010
cd marklogic-spark-connector
1111
./gradlew -i mlWaitTillReady
12+
sleep 3
13+
./gradlew -i mlWaitTillReady
1214
./gradlew mlTestConnections
1315
./gradlew -i mlDeploy
1416
echo "Loading data a second time to try to avoid Optic bug with duplicate rows being returned."
@@ -47,19 +49,19 @@ def tearDownDocker() {
4749

4850
pipeline{
4951
agent none
50-
52+
5153
triggers{
5254
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "")
5355
}
5456
parameters{
5557
booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
5658
}
57-
59+
5860
options {
5961
checkoutToSubdirectory 'marklogic-spark-connector'
6062
buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
6163
}
62-
64+
6365
environment{
6466
JAVA17_HOME_DIR="/home/builder/java/jdk-17.0.2"
6567
GRADLE_DIR =".gradle"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.saliman.properties' version '1.5.2'
2+
id 'net.saliman.properties' version '1.6.0'
33
id "java-library"
44
id "org.sonarqube" version "6.0.1.5171"
55
}

test-app/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ buildscript {
1111
}
1212
}
1313

14-
plugins {
15-
id "net.saliman.properties" version "1.5.2"
16-
}
17-
1814
apply plugin: "com.marklogic.ml-gradle"
1915

16+
// Sometimes, 3 x 20 isn't enough on Jenkins.
17+
mlWaitTillReady {
18+
maxAttempts = 40
19+
}
20+
2021
tasks.register("reloadTestData", com.marklogic.gradle.task.MarkLogicTask) {
2122
description = "Convenience task for clearing the test database and reloading the test data; only intended for a connector developer to use."
2223
doLast {

0 commit comments

Comments
 (0)