Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ def runtests(){
export PATH=$JAVA_HOME/bin:$PATH
cd marklogic-spark-connector
./gradlew -i mlWaitTillReady
sleep 3
./gradlew -i mlWaitTillReady
./gradlew mlTestConnections
./gradlew -i mlDeploy
echo "Loading data a second time to try to avoid Optic bug with duplicate rows being returned."
Expand Down Expand Up @@ -47,19 +49,19 @@ def tearDownDocker() {

pipeline{
agent none

triggers{
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "")
}
parameters{
booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
}

options {
checkoutToSubdirectory 'marklogic-spark-connector'
buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
}

environment{
JAVA17_HOME_DIR="/home/builder/java/jdk-17.0.2"
GRADLE_DIR =".gradle"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'net.saliman.properties' version '1.5.2'
id 'net.saliman.properties' version '1.6.0'
id "java-library"
id "org.sonarqube" version "6.0.1.5171"
}
Expand Down
9 changes: 5 additions & 4 deletions test-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ buildscript {
}
}

plugins {
id "net.saliman.properties" version "1.5.2"
}

apply plugin: "com.marklogic.ml-gradle"

// Sometimes, 3 x 20 isn't enough on Jenkins.
Copy link

Copilot AI Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment references '3 x 20' but the code sets maxAttempts to 40. This creates confusion about the actual timeout calculation. Update the comment to accurately reflect the new configuration, such as '// Sometimes, the default timeout isn't enough on Jenkins, so increasing to 40 attempts.'

Suggested change
// Sometimes, 3 x 20 isn't enough on Jenkins.
// Sometimes, the default timeout isn't enough on Jenkins, so increasing to 40 attempts.

Copilot uses AI. Check for mistakes.
mlWaitTillReady {
maxAttempts = 40
}

tasks.register("reloadTestData", com.marklogic.gradle.task.MarkLogicTask) {
description = "Convenience task for clearing the test database and reloading the test data; only intended for a connector developer to use."
doLast {
Expand Down