Temporary changes to debug proxy tests on Jenkins

Author: rjrudin

Jenkinsfile

@@ -172,7 +172,6 @@ pipeline{
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
           cd java-client-api
-          ./gradlew cleanTest marklogic-client-api:test
           ./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true
         '''
         junit '**/build/**/TEST*.xml'

marklogic-client-api-functionaltests/build.gradle

@@ -53,7 +53,7 @@ tasks.register("runFastFunctionalTests", Test) {
 	description = "Run all fast functional tests that don't setup/teardown custom app servers / databases"
 	testClassesDirs = sourceSets.test.output.classesDirs
 	classpath = sourceSets.test.runtimeClasspath
-	include "com/marklogic/client/fastfunctest/**"
+	include "com/marklogic/client/fastfunctest/TestAgg*"
 	// Exclude the "fragile" ones
 	exclude "com/marklogic/client/fastfunctest/TestQueryOptionBuilder.class"
 	exclude "com/marklogic/client/fastfunctest/TestRawCombinedQuery.class"

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java

@@ -950,6 +950,7 @@ private static void overrideTestPropertiesWithSystemProperties(Properties testPr
 		if ("true".equals(System.getProperty("TEST_USE_REVERSE_PROXY_SERVER"))) {
 			System.out.println("TEST_USE_REVERSE_PROXY_SERVER is true, so overriding properties to use reverse proxy server");
 			testProperties.setProperty("httpPort", "8020");
+			testProperties.setProperty("marklogic.client.host", "127.0.0.1");
 			testProperties.setProperty("marklogic.client.port", "8020");
 			testProperties.setProperty("marklogic.client.basePath", "testFunctional");
 			testProperties.setProperty("marklogic.client.authType", "basic");

test-app/src/main/java/com/marklogic/client/test/ReverseProxyServer.java

@@ -101,6 +101,10 @@ public static void main(final String[] args) throws Exception {
 	}
 
 	public ReverseProxyServer(String markLogicHost, String serverHost, int serverPort, int secureServerPort, List<String> customMappings) throws Exception {
+		System.out.println("MarkLogic host: " + markLogicHost);
+		System.out.println("Proxy server host: " + serverHost);
+		System.out.println("Proxy server HTTP port: " + serverPort);
+		System.out.println("Proxy server HTTPS port: " + secureServerPort);
 		logger.info("MarkLogic host: {}", markLogicHost);
 		logger.info("Proxy server host: {}", serverHost);
 		logger.info("Proxy server HTTP port: {}", serverPort);