Skip to content

Use RUNTIME_JAVA_HOME for test clusters #73003

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

Merged
merged 4 commits into from
May 26, 2021
Merged

Use RUNTIME_JAVA_HOME for test clusters #73003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
568bc53
Use RUNTIME_JAVA_HOME for test clusters
mark-vieira May 12, 2021
6538d56
Remove empty comment
mark-vieira May 12, 2021
8dca82e
Merge branch '6.8' into 6.8-runtime-java-home
elasticmachine May 25, 2021
64b3679
Fix busted test
mark-vieira May 26, 2021
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 buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
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
8 changes: 4 additions & 4 deletions ...ingle-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
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);
}
}
}
}