Skip to content

Commit 1c625b4

Browse files
committed
Upgrade to the latest MarkLogic 12 Docker image.
Switch Jenkinsfile to use the Docker image instead of the RPM.
1 parent 43b9049 commit 1c625b4

File tree

2 files changed

+28
-11
lines changed

2 files changed

+28
-11
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
1+
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.2.2

Jenkinsfile

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,54 @@ pipeline{
66
buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
77
}
88
environment{
9-
JAVA_HOME_DIR="/home/builder/java/jdk-17.0.2"
9+
JAVA17_HOME_DIR="/home/builder/java/jdk-17.0.2"
1010
GRADLE_DIR =".gradle"
1111
DMC_USER = credentials('MLBUILD_USER')
1212
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
13+
MARKLOGIC_IMAGE_TAG = "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.2.2"
14+
MARKLOGIC_LOGS_VOLUME = "/tmp/marklogic/logs"
15+
docker_registry = "ml-dev-docker-tierpoint.bed-artifactory.bedford.progress.com"
1316
}
1417
stages{
1518
stage('tests'){
1619
steps{
17-
copyRPM 'Release','11.3.0'
18-
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
19-
sh label:'setup', script: '''#!/bin/bash
20-
cd kafka-connector/test-app
21-
echo mlPassword=admin >> gradle-local.properties
22-
'''
20+
cleanupDocker()
21+
sh label:'mlsetup', script: '''#!/bin/bash
22+
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
23+
sudo /usr/local/sbin/mladmin remove
24+
docker-compose down -v || true
25+
sudo /usr/local/sbin/mladmin cleandata
26+
cd kafka-connector
27+
MARKLOGIC_LOGS_VOLUME=/tmp docker-compose up -d --build
28+
sleep 30s;
29+
'''
2330
sh label:'deploy project', script: '''#!/bin/bash
24-
export JAVA_HOME=$JAVA_HOME_DIR
31+
export JAVA_HOME=$JAVA17_HOME_DIR
2532
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2633
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
2734
cd kafka-connector
2835
./gradlew hubInit
29-
./gradlew mlDeploy -PmlPassword=admin
36+
./gradlew -i mlDeploy
3037
'''
3138
sh label:'test', script: '''#!/bin/bash
32-
export JAVA_HOME=$JAVA_HOME_DIR
39+
export JAVA_HOME=$JAVA17_HOME_DIR
3340
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
3441
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
3542
cd kafka-connector
3643
./gradlew test || true
3744
'''
3845
junit '**/build/**/*.xml'
3946
}
47+
post{
48+
always{
49+
updateWorkspacePermissions()
50+
sh label:'mlcleanup', script: '''#!/bin/bash
51+
cd kafka-connector
52+
docker-compose down -v || true
53+
'''
54+
cleanupDocker()
55+
}
56+
}
4057
}
4158
}
4259
}

0 commit comments

Comments
 (0)