Skip to content

Commit aa66563

Browse files
rjrudinrjrudin
committed
MLE-27077 Refactor: Reformatted script blocks in Jenkinsfile
Also removed the unused block for running all tests with the reverse proxy, will revisit enabling that later.
1 parent f30e259 commit aa66563

File tree

1 file changed

+73
-120
lines changed

1 file changed

+73
-120
lines changed

‎Jenkinsfile‎

Lines changed: 73 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -11,144 +11,97 @@ def getJavaHomePath() {
1111
def setupDockerMarkLogic(String image) {
1212
cleanupDocker()
1313
sh label: 'mlsetup', script: '''#!/bin/bash
14-
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
15-
sudo /usr/local/sbin/mladmin remove
16-
sudo /usr/local/sbin/mladmin cleandata
17-
cd java-client-api
18-
docker compose down -v || true
19-
docker volume prune -f
20-
echo "Using image: "''' + image + '''
21-
docker pull ''' + image + '''
22-
MARKLOGIC_IMAGE=''' + image + ''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
14+
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
15+
sudo /usr/local/sbin/mladmin remove
16+
sudo /usr/local/sbin/mladmin cleandata
17+
cd java-client-api
18+
docker compose down -v || true
19+
docker volume prune -f
20+
echo "Using image: "''' + image + '''
21+
docker pull ''' + image + '''
22+
MARKLOGIC_IMAGE=''' + image + ''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
2323
export JAVA_HOME=$JAVA_HOME_DIR
2424
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2525
export PATH=$JAVA_HOME/bin:$PATH
2626
./gradlew -i mlWaitTillReady
27-
sleep 3
28-
./gradlew -i mlWaitTillReady
29-
./gradlew mlTestConnections
30-
./gradlew -i mlDeploy mlReloadSchemas
27+
sleep 3
28+
./gradlew -i mlWaitTillReady
29+
./gradlew mlTestConnections
30+
./gradlew -i mlDeploy mlReloadSchemas
3131
'''
3232
}
3333

3434
def runTests(String image) {
3535
setupDockerMarkLogic(image)
3636

3737
sh label: 'run marklogic-client-api tests', script: '''#!/bin/bash
38-
export JAVA_HOME=$JAVA_HOME_DIR
39-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
40-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
41-
cd java-client-api
38+
export JAVA_HOME=$JAVA_HOME_DIR
39+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
40+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
41+
cd java-client-api
4242
43-
echo "Temporary fix for mysterious issue with okhttp3 being corrupted in local Maven cache."
44-
ls -la ~/.m2/repository/com/squareup
45-
rm -rf ~/.m2/repository/com/squareup/okhttp3/
43+
echo "Temporary fix for mysterious issue with okhttp3 being corrupted in local Maven cache."
44+
ls -la ~/.m2/repository/com/squareup
45+
rm -rf ~/.m2/repository/com/squareup/okhttp3/
4646
47-
echo "Ensure all subprojects can be built first."
48-
./gradlew clean build -x test
47+
echo "Ensure all subprojects can be built first."
48+
./gradlew clean build -x test
4949
50-
./gradlew marklogic-client-api:test || true
50+
./gradlew marklogic-client-api:test || true
5151
'''
5252

5353
sh label: 'run ml-development-tools tests', script: '''#!/bin/bash
54-
export JAVA_HOME=$JAVA_HOME_DIR
55-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
56-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
57-
cd java-client-api
58-
./gradlew ml-development-tools:test || true
54+
export JAVA_HOME=$JAVA_HOME_DIR
55+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
56+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
57+
cd java-client-api
58+
./gradlew ml-development-tools:test || true
5959
'''
6060

6161
sh label: 'run fragile functional tests', script: '''#!/bin/bash
62-
export JAVA_HOME=$JAVA_HOME_DIR
63-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
64-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
65-
cd java-client-api
66-
./gradlew mlDeploy -PmlForestDataDirectory=/space
67-
./gradlew marklogic-client-api-functionaltests:runFragileTests || true
62+
export JAVA_HOME=$JAVA_HOME_DIR
63+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
64+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
65+
cd java-client-api
66+
./gradlew mlDeploy -PmlForestDataDirectory=/space
67+
./gradlew marklogic-client-api-functionaltests:runFragileTests || true
6868
'''
6969

7070
sh label: 'run fast functional tests', script: '''#!/bin/bash
71-
export JAVA_HOME=$JAVA_HOME_DIR
72-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
73-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
74-
cd java-client-api
75-
./gradlew marklogic-client-api-functionaltests:runFastFunctionalTests || true
71+
export JAVA_HOME=$JAVA_HOME_DIR
72+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
73+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
74+
cd java-client-api
75+
./gradlew marklogic-client-api-functionaltests:runFastFunctionalTests || true
7676
'''
7777

7878
sh label: 'run slow functional tests', script: '''#!/bin/bash
79-
export JAVA_HOME=$JAVA_HOME_DIR
80-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
81-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
82-
cd java-client-api
83-
./gradlew marklogic-client-api-functionaltests:runSlowFunctionalTests || true
84-
'''
85-
86-
postProcessTestResults()
87-
}
88-
89-
def runTestsWithReverseProxy(String image) {
90-
setupDockerMarkLogic(image)
91-
92-
sh label: 'run marklogic-client-api tests with reverse proxy', script: '''#!/bin/bash
93-
export JAVA_HOME=$JAVA_HOME_DIR
94-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
95-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
96-
cd java-client-api
97-
98-
echo "Temporary fix for mysterious issue with okhttp3 being corrupted in local Maven cache."
99-
ls -la ~/.m2/repository/com/squareup
100-
rm -rf ~/.m2/repository/com/squareup/okhttp3/
101-
102-
echo "Ensure all subprojects can be built first."
103-
./gradlew clean build -x test
104-
105-
echo "Running marklogic-client-api tests with reverse proxy."
106-
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api:test || true
107-
'''
108-
109-
sh label: 'run fragile functional tests with reverse proxy', script: '''#!/bin/bash
110-
export JAVA_HOME=$JAVA_HOME_DIR
111-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
112-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
113-
cd java-client-api
114-
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api-functionaltests:runFragileTests || true
115-
'''
116-
117-
sh label: 'run fast functional tests with reverse proxy', script: '''#!/bin/bash
118-
export JAVA_HOME=$JAVA_HOME_DIR
119-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
120-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
121-
cd java-client-api
122-
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
123-
'''
124-
125-
sh label: 'run slow functional tests with reverse proxy', script: '''#!/bin/bash
126-
export JAVA_HOME=$JAVA_HOME_DIR
127-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
128-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
129-
cd java-client-api
130-
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api-functionaltests:runSlowFunctionalTests || true
79+
export JAVA_HOME=$JAVA_HOME_DIR
80+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
81+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
82+
cd java-client-api
83+
./gradlew marklogic-client-api-functionaltests:runSlowFunctionalTests || true
13184
'''
13285

13386
postProcessTestResults()
13487
}
13588

13689
def postProcessTestResults() {
13790
sh label: 'post-test-process', script: '''
138-
cd java-client-api
139-
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFragileTests
140-
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests
141-
mkdir -p marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests
142-
cd $WORKSPACE/java-client-api/marklogic-client-api/build/test-results/test/
143-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
144-
cd $WORKSPACE/java-client-api/ml-development-tools/build/test-results/test/
145-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
146-
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFragileTests/
147-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
148-
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests/
149-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
150-
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests/
151-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
91+
cd java-client-api
92+
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFragileTests
93+
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests
94+
mkdir -p marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests
95+
cd $WORKSPACE/java-client-api/marklogic-client-api/build/test-results/test/
96+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
97+
cd $WORKSPACE/java-client-api/ml-development-tools/build/test-results/test/
98+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
99+
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFragileTests/
100+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
101+
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests/
102+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
103+
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests/
104+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
152105
'''
153106
}
154107

@@ -193,19 +146,19 @@ pipeline {
193146
steps {
194147
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
195148
sh label: 'run marklogic-client-api tests', script: '''#!/bin/bash
196-
export JAVA_HOME=$JAVA_HOME_DIR
197-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
198-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
199-
cd java-client-api
149+
export JAVA_HOME=$JAVA_HOME_DIR
150+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
151+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
152+
cd java-client-api
200153
201-
echo "Temporary fix for mysterious issue with okhttp3 being corrupted in local Maven cache."
202-
ls -la ~/.m2/repository/com/squareup
154+
echo "Temporary fix for mysterious issue with okhttp3 being corrupted in local Maven cache."
155+
ls -la ~/.m2/repository/com/squareup
203156
rm -rf ~/.m2/repository/com/squareup/okhttp3/
204157
205-
echo "Ensure all subprojects can be built first."
206-
./gradlew clean build -x test
158+
echo "Ensure all subprojects can be built first."
159+
./gradlew clean build -x test
207160
208-
echo "Run a sufficient number of tests to verify the PR."
161+
echo "Run a sufficient number of tests to verify the PR."
209162
./gradlew marklogic-client-api:test
210163
211164
echo "Run a test with the reverse proxy server to ensure it's fine."
@@ -230,12 +183,12 @@ pipeline {
230183
}
231184
steps {
232185
sh label: 'publish', script: '''#!/bin/bash
233-
export JAVA_HOME=$JAVA_HOME_DIR
234-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
235-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
236-
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;
237-
cd java-client-api
238-
./gradlew publish
186+
export JAVA_HOME=$JAVA_HOME_DIR
187+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
188+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
189+
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;
190+
cd java-client-api
191+
./gradlew publish
239192
'''
240193
}
241194
}

0 commit comments

Comments
 (0)