From 0d488cfbb9d85320992c3a06e950ad32549cdce7 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Mon, 31 Aug 2020 11:06:12 +0200
Subject: [PATCH] Fix bwc testcluster setup against elastic < 6.3

---
 .../gradle/testclusters/ElasticsearchNode.java           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
index 58b52b3b717..6681168f467 100644
--- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
+++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
@@ -453,7 +453,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
             pluginsToInstall.addAll(plugins.stream().map(Provider::get).map(URI::toString).collect(Collectors.toList()));
         }
 
-        if (getVersion().before("6.3.0") && testDistribution == TestDistribution.DEFAULT) {
+        if (requiresAddingXPack()) {
             logToProcessStdout("emulating the " + testDistribution + " flavor for " + getVersion() + " by installing x-pack");
             pluginsToInstall.add("x-pack");
         }
@@ -524,8 +524,13 @@ public class ElasticsearchNode implements TestClusterConfiguration {
         startElasticsearchProcess();
     }
 
+    private boolean requiresAddingXPack() {
+        boolean b = getVersion().before("6.3.0") && testDistribution == TestDistribution.DEFAULT;
+        return getVersion().before("6.3.0") && testDistribution == TestDistribution.DEFAULT;
+    }
+
     private boolean canUseSharedDistribution() {
-        return extraJarFiles.size() == 0 && modules.size() == 0 && plugins.size() == 0;
+        return extraJarFiles.size() == 0 && modules.size() == 0 && plugins.size() == 0 && !requiresAddingXPack();
     }
 
     private void logToProcessStdout(String message) {