Skip to content
Closed
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
9 changes: 4 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ def runTests() {
npm --version
npm ci
cd test-app
./gradlew -i mlTestConnections
./gradlew -i mlDeploy
cd test-app
./gradlew -i mlWaitTillReady
./gradlew -i mlTestConnections
./gradlew -i mlDeploy
cd ..
rm -rf $WORKSPACE/*.xml || true
Expand All @@ -33,8 +34,6 @@ def runDockerCompose(String markLogicDockerImage) {
cd node-client-api
echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''"
MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build
echo "Waiting 90s for MarkLogic to be ready to accept connections"
sleep 90s;
'''
}

Expand Down
36 changes: 27 additions & 9 deletions test-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
// Only used for setting up the test AppServer in MarkLogic
buildscript {
repositories {
mavenCentral()
// Needed for ml-gradle 6.2-SNAPSHOT mavenLocal()
maven {
url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
}
}
dependencies {
classpath "com.marklogic:ml-gradle:6.2-SNAPSHOT"
}
}

plugins {
id 'net.saliman.properties' version '1.5.2'
// Sticking with 5.0.0 until a bug in 6.0.x is fixed where LSQT config isn't deployed correctly.
id "com.marklogic.ml-gradle" version "5.0.0"
id "net.saliman.properties" version "1.5.2"
}

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

// Using default values, including this to show how to configure the task.
mlWaitTillReady {
waitInterval = 2000
maxAttempts = 30
}

tasks.register("addMarkLogic12SchemasIfNecessary", com.marklogic.gradle.task.MarkLogicTask) {
Expand All @@ -22,9 +40,9 @@ mlLoadSchemas.dependsOn addMarkLogic12SchemasIfNecessary
* that requires SSL.
*/
ext {
def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand()
command.setTemplateIdOrName("node-client-ssl-template")
command.setCommonName("localhost")
command.setValidFor(365)
mlAppDeployer.commands.add(command)
def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand()
command.setTemplateIdOrName("node-client-ssl-template")
command.setCommonName("localhost")
command.setValidFor(365)
mlAppDeployer.commands.add(command)
}