Skip to content

Commit 20867ce

Browse files
rjrudinrjrudin
authored
Merge pull request #1722 from marklogic/feature/17306-jenkins
MLE-17306 Cleaning up Jenkinsfile
2 parents 163c58d + eead6a8 commit 20867ce

File tree

4 files changed

+107
-97
lines changed

4 files changed

+107
-97
lines changed

‎Jenkinsfile‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -34,102 +34,102 @@ def setupDockerMarkLogic(String image){
3434
'''
3535
}
3636

37-
def runAllTests(Boolean useReverseProxy, String image){
38-
setupDockerMarkLogic(image)
37+
def runTests(String image) {
38+
setupDockerMarkLogic(image)
3939

40-
if (useReverseProxy) {
41-
// Skip testing the marklogic-client-api tests with reverse proxy
42-
} else {
43-
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
44-
export JAVA_HOME=$JAVA_HOME_DIR
45-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
46-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
47-
cd java-client-api
48-
mkdir -p marklogic-client-api/build/test-results/test
49-
./gradlew marklogic-client-api:test || true
50-
'''
51-
}
40+
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
41+
export JAVA_HOME=$JAVA_HOME_DIR
42+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
43+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
44+
cd java-client-api
45+
mkdir -p marklogic-client-api/build/test-results/test
46+
./gradlew marklogic-client-api:test || true
47+
'''
5248

53-
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-
mkdir -p ml-development-tools/build/test-results/test
59-
./gradlew ml-development-tools:test || true
60-
'''
49+
sh label:'run ml-development-tools tests', script: '''#!/bin/bash
50+
export JAVA_HOME=$JAVA_HOME_DIR
51+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
52+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
53+
cd java-client-api
54+
mkdir -p ml-development-tools/build/test-results/test
55+
./gradlew ml-development-tools:test || true
56+
'''
6157

62-
if (useReverseProxy) {
63-
sh label:'run fragile functional tests with reverse proxy', script: '''#!/bin/bash
64-
export JAVA_HOME=$JAVA_HOME_DIR
65-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
66-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
67-
cd java-client-api
68-
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFragileTests || true
69-
'''
70-
} else {
71-
sh label:'run fragile functional tests', script: '''#!/bin/bash
72-
export JAVA_HOME=$JAVA_HOME_DIR
73-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
74-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
75-
cd java-client-api
76-
./gradlew mlDeploy -PmlForestDataDirectory=/space
77-
./gradlew marklogic-client-api-functionaltests:runFragileTests || true
78-
'''
79-
}
58+
sh label:'run fragile functional tests', script: '''#!/bin/bash
59+
export JAVA_HOME=$JAVA_HOME_DIR
60+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
61+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
62+
cd java-client-api
63+
./gradlew mlDeploy -PmlForestDataDirectory=/space
64+
./gradlew marklogic-client-api-functionaltests:runFragileTests || true
65+
'''
8066

81-
if (useReverseProxy) {
82-
sh label:'run fast functional tests with reverse proxy', script: '''#!/bin/bash
83-
export JAVA_HOME=$JAVA_HOME_DIR
84-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
85-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
86-
cd java-client-api
87-
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
88-
'''
89-
} else {
90-
sh label:'run fast functional tests', script: '''#!/bin/bash
91-
export JAVA_HOME=$JAVA_HOME_DIR
92-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
93-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
94-
cd java-client-api
95-
./gradlew marklogic-client-api-functionaltests:runFastFunctionalTests || true
96-
'''
97-
}
67+
sh label:'run fast functional tests', script: '''#!/bin/bash
68+
export JAVA_HOME=$JAVA_HOME_DIR
69+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
70+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
71+
cd java-client-api
72+
./gradlew marklogic-client-api-functionaltests:runFastFunctionalTests || true
73+
'''
9874

99-
if (useReverseProxy) {
100-
sh label:'run slow functional tests with reverse proxy', script: '''#!/bin/bash
101-
export JAVA_HOME=$JAVA_HOME_DIR
102-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
103-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
104-
cd java-client-api
105-
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runSlowFunctionalTests || true
106-
'''
107-
} else {
108-
sh label:'run slow functional tests', script: '''#!/bin/bash
109-
export JAVA_HOME=$JAVA_HOME_DIR
110-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
111-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
112-
cd java-client-api
113-
./gradlew marklogic-client-api-functionaltests:runSlowFunctionalTests || true
114-
'''
115-
}
75+
sh label:'run slow functional tests', script: '''#!/bin/bash
76+
export JAVA_HOME=$JAVA_HOME_DIR
77+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
78+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
79+
cd java-client-api
80+
./gradlew marklogic-client-api-functionaltests:runSlowFunctionalTests || true
81+
'''
11682

117-
sh label:'post-test-process', script: '''
118-
cd java-client-api
119-
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFragileTests
120-
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests
121-
mkdir -p marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests
122-
cd $WORKSPACE/java-client-api/marklogic-client-api/build/test-results/test/
123-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
124-
cd $WORKSPACE/java-client-api/ml-development-tools/build/test-results/test/
125-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
126-
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFragileTests/
127-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
128-
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests/
129-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
130-
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests/
131-
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
132-
'''
83+
postProcessTestResults()
84+
}
85+
86+
def runTestsWithReverseProxy(String image) {
87+
setupDockerMarkLogic(image)
88+
89+
sh label:'run fragile functional tests with reverse proxy', script: '''#!/bin/bash
90+
export JAVA_HOME=$JAVA_HOME_DIR
91+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
92+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
93+
cd java-client-api
94+
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFragileTests || true
95+
'''
96+
97+
sh label:'run fast functional tests with reverse proxy', script: '''#!/bin/bash
98+
export JAVA_HOME=$JAVA_HOME_DIR
99+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
100+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
101+
cd java-client-api
102+
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
103+
'''
104+
105+
sh label:'run slow functional tests with reverse proxy', script: '''#!/bin/bash
106+
export JAVA_HOME=$JAVA_HOME_DIR
107+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
108+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
109+
cd java-client-api
110+
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runSlowFunctionalTests || true
111+
'''
112+
113+
postProcessTestResults()
114+
}
115+
116+
def postProcessTestResults() {
117+
sh label:'post-test-process', script: '''
118+
cd java-client-api
119+
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFragileTests
120+
mkdir -p marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests
121+
mkdir -p marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests
122+
cd $WORKSPACE/java-client-api/marklogic-client-api/build/test-results/test/
123+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
124+
cd $WORKSPACE/java-client-api/ml-development-tools/build/test-results/test/
125+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
126+
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFragileTests/
127+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
128+
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runFastFunctionalTests/
129+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
130+
cd $WORKSPACE/java-client-api/marklogic-client-api-functionaltests/build/test-results/runSlowFunctionalTests/
131+
sed -i "s/classname=\\"/classname=\\"${STAGE_NAME}-/g" TEST*.xml
132+
'''
133133
}
134134

135135
def tearDownDocker() {
@@ -169,7 +169,7 @@ pipeline{
169169
}
170170
}
171171
steps {
172-
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
172+
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
173173
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
174174
export JAVA_HOME=$JAVA_HOME_DIR
175175
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -213,7 +213,7 @@ pipeline{
213213
}
214214
}
215215
steps {
216-
runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:11.2.0-ubi")
216+
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:11.2.0-ubi")
217217
junit '**/build/**/TEST*.xml'
218218
}
219219
post {
@@ -231,7 +231,7 @@ pipeline{
231231
}
232232
}
233233
steps {
234-
runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
234+
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
235235
junit '**/build/**/TEST*.xml'
236236
}
237237
post {
@@ -249,7 +249,7 @@ pipeline{
249249
}
250250
}
251251
steps {
252-
runAllTests(true, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
252+
runTestsWithReverseProxy("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
253253
junit '**/build/**/TEST*.xml'
254254
}
255255
post {
@@ -267,7 +267,7 @@ pipeline{
267267
}
268268
}
269269
steps {
270-
runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
270+
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
271271
junit '**/build/**/TEST*.xml'
272272
}
273273
post {
@@ -285,7 +285,7 @@ pipeline{
285285
}
286286
}
287287
steps {
288-
runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10")
288+
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10")
289289
junit '**/build/**/TEST*.xml'
290290
}
291291
post {

‎marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestOpticOnViews.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2187,6 +2187,12 @@ public void testFromSqlBetweenAndSqlCondition() {
21872187
//fromsql TEST 27 - union with select, orderby, limit, and offset
21882188
@Test
21892189
public void testFromSqlUnionSelectOrderbyLimitOffset() {
2190+
if (isML12OrHigher) {
2191+
logger.info("Skipping as this fails intermittently on MarkLogic 12 for unknown reasons. Consistently " +
2192+
"passes locally.");
2193+
return;
2194+
}
2195+
21902196
RowManager rowManager = client.newRowManager();
21912197
PlanBuilder op = rowManager.newPlanBuilder();
21922198

‎marklogic-client-api/src/test/java/com/marklogic/client/test/ssl/OneWaySSLTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.marklogic.client.test.Common;
88
import com.marklogic.client.test.junit5.DisabledWhenUsingReverseProxyServer;
99
import com.marklogic.client.test.junit5.RequireSSLExtension;
10+
import com.marklogic.client.test.junit5.RequiresML11OrLower;
1011
import org.junit.jupiter.api.Test;
1112
import org.junit.jupiter.api.extension.ExtendWith;
1213

@@ -84,8 +85,9 @@ void defaultSslContext() throws Exception {
8485
assertTrue(ex.getCause() instanceof SSLException, "Unexpected cause: " + ex.getCause());
8586
}
8687

87-
// Currently failing on 12-nightly due to https://progresssoftware.atlassian.net/browse/MLE-17505 .
88+
// Currently failing on 12-nightly due to https://progresssoftware.atlassian.net/browse/MLE-17505 .
8889
@Test
90+
@ExtendWith(RequiresML11OrLower.class)
8991
void noSslContext() {
9092
DatabaseClient client = Common.newClientBuilder().build();
9193

‎marklogic-client-api/src/test/java/com/marklogic/client/test/ssl/TwoWaySSLTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.marklogic.client.test.Common;
1212
import com.marklogic.client.test.junit5.DisabledWhenUsingReverseProxyServer;
1313
import com.marklogic.client.test.junit5.RequireSSLExtension;
14+
import com.marklogic.client.test.junit5.RequiresML11OrLower;
1415
import com.marklogic.mgmt.ManageClient;
1516
import com.marklogic.mgmt.resource.appservers.ServerManager;
1617
import com.marklogic.mgmt.resource.security.CertificateTemplateManager;
@@ -99,6 +100,7 @@ public static void teardown() {
99100
*/
100101
// Currently failing on 12-nightly due to https://progresssoftware.atlassian.net/browse/MLE-17505 .
101102
@Test
103+
@ExtendWith(RequiresML11OrLower.class)
102104
void digestAuthentication() {
103105
// This client uses our Java KeyStore file with a client certificate in it, so it should work.
104106
DatabaseClient clientWithCert = Common.newClientBuilder()

0 commit comments

Comments
 (0)