Skip to content

Commit 14f3273

Browse files
authored
Use RUNTIME_JAVA_HOME for test clusters (#73003)
1 parent 4c5f2e4 commit 14f3273

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ class ClusterFormationTasks {
700700
esJavaOpts.add('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000')
701701
}
702702
node.env['ES_JAVA_OPTS'] = esJavaOpts.join(" ")
703+
node.env['JAVA_HOME'] = node.getJavaHome()
703704

704-
//
705705
project.logger.info("Starting node in ${node.clusterName} distribution: ${node.config.distribution}")
706706
}
707707
return start

x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
* gets reflected in the dataset structure.
3131
* The doc tests while redundant, try to be expressive first and foremost and sometimes
3232
* the dataset isn't exactly convenient.
33-
*
33+
*
3434
* Also looking around for the tests across the test files isn't trivial.
35-
*
35+
*
3636
* That's not to say the two cannot be merged however that felt like too much of an effort
3737
* at this stage and, to not keep things stalling, started with this approach.
3838
*/
@@ -69,7 +69,7 @@ protected void assertResults(ResultSet expected, ResultSet elastic) throws SQLEx
6969
// uncomment this to printout the result set and create new CSV tests
7070
//
7171
//JdbcTestUtils.logLikeCLI(elastic, log);
72-
JdbcAssert.assertResultSets(expected, elastic, log, true, false);
72+
JdbcAssert.assertResultSets(expected, elastic, log, true, true);
7373
}
7474

7575
@Override
@@ -87,4 +87,4 @@ protected final void doTest() throws Throwable {
8787
assertResults(expected, elasticResults);
8888
}
8989
}
90-
}
90+
}

0 commit comments

Comments
 (0)