Skip to content
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.

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

Use RUNTIME_JAVA_HOME for test clusters #73003

Merged
merged 4 commits into from May 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -700,8 +700,8 @@ class ClusterFormationTasks {
esJavaOpts.add('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000')
}
node.env['ES_JAVA_OPTS'] = esJavaOpts.join(" ")
node.env['JAVA_HOME'] = node.getJavaHome()

//
project.logger.info("Starting node in ${node.clusterName} distribution: ${node.config.distribution}")
}
return start
Expand Down
Expand Up @@ -30,9 +30,9 @@
* gets reflected in the dataset structure.
* The doc tests while redundant, try to be expressive first and foremost and sometimes
* the dataset isn't exactly convenient.
*
*
* Also looking around for the tests across the test files isn't trivial.
*
*
* That's not to say the two cannot be merged however that felt like too much of an effort
* at this stage and, to not keep things stalling, started with this approach.
*/
Expand Down Expand Up @@ -69,7 +69,7 @@ protected void assertResults(ResultSet expected, ResultSet elastic) throws SQLEx
// uncomment this to printout the result set and create new CSV tests
//
//JdbcTestUtils.logLikeCLI(elastic, log);
JdbcAssert.assertResultSets(expected, elastic, log, true, false);
JdbcAssert.assertResultSets(expected, elastic, log, true, true);
}

@Override
Expand All @@ -87,4 +87,4 @@ protected final void doTest() throws Throwable {
assertResults(expected, elasticResults);
}
}
}
}