Fix issue where runtime Java was not properly respected for test clus…

…ter (elastic#51557)
matriv · Jan 28, 2020 · 4630c8d · 4630c8d
1 parent 308f95d
commit 4630c8d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
@@ -651,7 +651,7 @@ private void runElasticsearchBinScript(String tool, CharSequence... args) {
     private Map<String, String> getESEnvironment() {
         Map<String, String> defaultEnv = new HashMap<>();
         // If we are testing the current version of Elasticsearch, use the configured runtime Java, otherwise use the bundled JDK
-        if (getTestDistribution() == TestDistribution.INTEG_TEST || getVersion().toString().equals(VersionProperties.getElasticsearch())) {
+        if (getTestDistribution() == TestDistribution.INTEG_TEST || getVersion().equals(VersionProperties.getElasticsearchVersion())) {
             defaultEnv.put("JAVA_HOME", BuildParams.getRuntimeJavaHome().getAbsolutePath());
         }
         defaultEnv.put("ES_PATH_CONF", configFile.getParent().toString());