Skip to content

MLE-24523 Debugging reverse proxy tests #1840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

MLE-24523 Debugging reverse proxy tests #1840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3933b8
MLE-24523 Getting reverse proxy tests running again
rjrudin Oct 7, 2025
576b996
Temporary debugging
rjrudin Oct 8, 2025
4c6324e
More hacking
rjrudin Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copyrightconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ startyear: 2010
# - Dotfiles already skipped automatically
# Enable by removing the leading '# ' from the next line and editing values.
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, pom.xml
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yaml, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, pom.xml
79 changes: 45 additions & 34 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@Library('shared-libraries') _

def getJava() {
def getJavaHomePath() {
if (env.JAVA_VERSION == "JAVA21") {
return "/home/builder/java/jdk-21.0.1"
} else {
Expand Down Expand Up @@ -84,28 +84,37 @@ def runTests(String image) {
def runTestsWithReverseProxy(String image) {
setupDockerMarkLogic(image)

sh label: 'run marklogic-client-api tests with reverse proxy', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
./gradlew clean build -x test
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api:test || true
'''

sh label: 'run fragile functional tests with reverse proxy', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFragileTests || true
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api-functionaltests:runFragileTests || true
'''

sh label: 'run fast functional tests with reverse proxy', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
'''

sh label: 'run slow functional tests with reverse proxy', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runSlowFunctionalTests || true
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api-functionaltests:runSlowFunctionalTests || true
'''

postProcessTestResults()
Expand Down Expand Up @@ -149,39 +158,42 @@ pipeline {

parameters {
booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
string(name: 'Email', defaultValue: '', description: 'Who should I say send the email to?')
string(name: 'JAVA_VERSION', defaultValue: 'JAVA8', description: 'Who should I say send the email to?')
string(name: 'JAVA_VERSION', defaultValue: 'JAVA17', description: 'Either JAVA17 or JAVA21')
}

environment {
JAVA_HOME_DIR = getJava()
JAVA_HOME_DIR = getJavaHomePath()
GRADLE_DIR = ".gradle"
DMC_USER = credentials('MLBUILD_USER')
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
}

stages {

stage('pull-request-tests') {
when {
not {
expression { return params.regressions }
}
}
steps {
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:11.3.2-ubi-rootless-2.2.2")
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
sh label: 'run marklogic-client-api tests', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
// Ensure all modules can be built first.
./gradlew clean build -x test
//./gradlew clean build -x test

// Run a sufficient number of tests to verify the PR.
./gradlew cleanTest marklogic-client-api:test || true
//./gradlew marklogic-client-api:test --tests ReadDocumentPageTest || true

// Run a test with the reverse proxy server to ensure it's fine.
echo "Starting tests!"
./gradlew -PtestUseReverseProxyServer=true clean runReverseProxyServer marklogic-client-api:test --tests ReadDocumentPageTest || true
echo "Finished tests!"
'''
// Omitting this until MLE-24523 can be addressed
// ./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
junit '**/build/**/TEST*.xml'
}
post {
Expand Down Expand Up @@ -218,7 +230,7 @@ pipeline {
}
}
steps {
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:11.3.2-ubi-rootless-2.2.2")
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
junit '**/build/**/TEST*.xml'
}
post {
Expand All @@ -229,25 +241,24 @@ pipeline {
}
}

// Omitting this until MLE-24523 can be addressed
// stage('regressions-11-reverseProxy') {
// when {
// allOf {
// branch 'develop'
// expression {return params.regressions}
// }
// }
// steps {
// runTestsWithReverseProxy("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
// junit '**/build/**/TEST*.xml'
// }
// post {
// always {
// updateWorkspacePermissions()
// tearDownDocker()
// }
// }
// }
stage('regressions-12-reverseProxy') {
when {
allOf {
branch 'develop'
expression {return params.regressions}
}
}
steps {
runTestsWithReverseProxy("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
junit '**/build/**/TEST*.xml'
}
post {
always {
updateWorkspacePermissions()
tearDownDocker()
}
}
}

stage('regressions-12') {
when {
Expand All @@ -257,7 +268,7 @@ pipeline {
}
}
steps {
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.2.0")
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
junit '**/build/**/TEST*.xml'
}
post {
Expand All @@ -268,7 +279,7 @@ pipeline {
}
}

stage('regressions-10.0') {
stage('regressions-10') {
when {
allOf {
branch 'develop'
Expand Down
5 changes: 1 addition & 4 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ services:
- ${MARKLOGIC_LOGS_VOLUME}:/var/opt/MarkLogic/Logs
ports:
- "8000-8002:8000-8002"
- "8010-8014:8010-8014"
- "8022:8022"
- "8054-8059:8054-8059"
- "8093:8093"
- "8010-8015:8010-8015" # Range of ports used by app servers, at least one of which - 8015 - is created by a test.

volumes:
marklogicLogs:
5 changes: 2 additions & 3 deletions ...altests/src/test/java/com/marklogic/client/fastfunctest/TestDatabaseClientConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,10 @@ void invalidPort() {
DatabaseClient client = newDatabaseClientBuilder().withPort(assumedInvalidPort).build();

MarkLogicIOException ex = Assertions.assertThrows(MarkLogicIOException.class, () -> client.checkConnection());
String expected = "Error occurred while calling http://localhost:60123/v1/ping; java.net.ConnectException: " +
"Failed to connect to localhost/127.0.0.1:60123 ; possible reasons for the error include " +
String expected = "Failed to connect to localhost/127.0.0.1:60123 ; possible reasons for the error include " +
"that a MarkLogic app server may not be listening on the port, or MarkLogic was stopped " +
"or restarted during the request; check the MarkLogic server logs for more information.";
assertEquals(expected, ex.getMessage());
assertTrue(ex.getMessage().contains(expected), "Unexpected error: " + ex.getMessage());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...unctionaltests/src/test/java/com/marklogic/client/functionaltest/BulkIOCallersFnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class BulkIOCallersFnTest extends BasicJavaClientREST {
private static String host = null;

private static int modulesPort = 8000;
private static int restTestport = 8093;
private static int restTestport = 8015;
private static String restServerName = "TestDynamicIngest";

private static SecurityContext secContext = null;
Expand Down
5 changes: 5 additions & 0 deletions test-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ You can also specify custom mappings via the Gradle task. For example, if you ha
port 8123 and you want to associate a path of "/my/custom/server" to it, you can do:

./gradlew runBlock -PrpsCustomMappings=/my/custom/server,8123

To run one or more tests with the reverse proxy server being started, the tests being run, and then the server being
stopped, do the following (you can see examples of this in the project `Jenkinsfile` as well):

./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api:test --tests ReadDocumentPageTest
Copy link

Copilot AI Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation uses tabs instead of spaces, which is inconsistent with the rest of the file that uses spaces. Consider using consistent spacing.

Suggested change
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api:test --tests ReadDocumentPageTest
./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api:test --tests ReadDocumentPageTest

Copilot uses AI. Check for mistakes.