Skip to content

Commit 2f7315e

Browse files
authored
Merge pull request #1716 from BillFarber/task/useDockerInJenkins
Remove a set of tests that not required.
2 parents d99fa11 + 216bdfb commit 2f7315e

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

Jenkinsfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,7 @@ def runAllTests(Boolean useReverseProxy, String image){
3838
setupDockerMarkLogic(image)
3939

4040
if (useReverseProxy) {
41-
sh label:'run marklogic-client-api tests with reverse proxy', script: '''#!/bin/bash
42-
export JAVA_HOME=$JAVA_HOME_DIR
43-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
44-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
45-
cd java-client-api
46-
mkdir -p marklogic-client-api/build/test-results/test
47-
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api:test || true
48-
'''
41+
// Skip testing the marklogic-client-api tests with reverse proxy
4942
} else {
5043
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
5144
export JAVA_HOME=$JAVA_HOME_DIR
@@ -72,7 +65,6 @@ def runAllTests(Boolean useReverseProxy, String image){
7265
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
7366
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
7467
cd java-client-api
75-
./gradlew mlDeploy -PmlForestDataDirectory=/space
7668
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFragileTests || true
7769
'''
7870
} else {

0 commit comments

Comments
 (0)