Skip to content

Commit 7636a2f

Browse files
MLE-3943: Updating the pipeline to use marklogic docker
1 parent fa33c84 commit 7636a2f

File tree

1 file changed

+43
-16
lines changed

1 file changed

+43
-16
lines changed

Jenkinsfile

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@Library('shared-libraries') _
22

3-
def runtests(String mlVersionType, String mlVersion, String javaVersion){
4-
copyRPM mlVersionType,mlVersion
5-
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
3+
def runtests(String javaVersion){
64
sh label:'test', script: '''#!/bin/bash
75
export JAVA_HOME=$'''+javaVersion+'''
86
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
97
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
108
cd marklogic-spark-connector
119
echo "mlPassword=admin" > gradle-local.properties
10+
echo "Waiting for MarkLogic server to initialize."
11+
sleep 30s
1212
./gradlew -i mlDeploy
1313
echo "Loading data a second time to try to avoid Optic bug with duplicate rows being returned."
1414
./gradlew -i mlLoadData
@@ -53,11 +53,29 @@ pipeline{
5353
}
5454
agent {label 'devExpLinuxPool'}
5555
steps{
56-
runtests('Latest','11','JAVA11_HOME_DIR')
56+
sh label:'mlsetup', script: '''#!/bin/bash
57+
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
58+
sudo /usr/local/sbin/mladmin remove
59+
sudo /usr/local/sbin/mladmin cleandata
60+
cd marklogic-spark-connector
61+
mkdir -p docker/marklogic/logs
62+
docker-compose down -v || true
63+
docker-compose up -d --build
64+
'''
65+
runtests('JAVA11_HOME_DIR')
5766
withSonarQubeEnv('SONAR_Progress') {
5867
runSonarScan('JAVA11_HOME_DIR')
5968
}
6069
}
70+
post{
71+
always{
72+
sh label:'mlcleanup', script: '''#!/bin/bash
73+
cd marklogic-spark-connector
74+
docker-compose down -v || true
75+
sudo /usr/local/sbin/mladmin delete $WORKSPACE/marklogic-spark-connector/docker/marklogic/logs/
76+
'''
77+
}
78+
}
6179
}
6280
stage('publish'){
6381
agent {label 'devExpLinuxPool'}
@@ -76,26 +94,35 @@ pipeline{
7694
}
7795
}
7896
stage('regressions'){
97+
agent {label 'devExpLinuxPool'}
7998
when{
8099
allOf{
81100
branch 'develop'
82101
expression {return params.regressions}
83102
}
84103
}
85-
parallel{
86-
stage('11-nightly-java11'){
87-
agent {label 'devExpLinuxPool'}
88-
steps{
89-
runtests('Latest','11','JAVA11_HOME_DIR')
90-
}
91-
}
92-
stage('10.0-9.5-java11'){
93-
agent {label 'devExpLinuxPool'}
94-
steps{
95-
runtests('Release','10.0-9.5','JAVA11_HOME_DIR')
96-
}
104+
steps{
105+
sh label:'mlsetup', script: '''#!/bin/bash
106+
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
107+
sudo /usr/local/sbin/mladmin remove
108+
sudo /usr/local/sbin/mladmin cleandata
109+
cd marklogic-spark-connector
110+
mkdir -p docker/marklogic/logs
111+
docker-compose down -v || true
112+
MARKLOGIC_TAG=latest-10.0 docker-compose up -d --build
113+
'''
114+
runtests('JAVA11_HOME_DIR')
115+
}
116+
post{
117+
always{
118+
sh label:'mlcleanup', script: '''#!/bin/bash
119+
cd marklogic-spark-connector
120+
docker-compose down -v || true
121+
sudo /usr/local/sbin/mladmin delete $WORKSPACE/marklogic-spark-connector/docker/marklogic/logs/
122+
'''
97123
}
98124
}
125+
99126
}
100127
}
101128
}

0 commit comments

Comments
 (0)