From 67bf3a4f51528592f2b56c6eb05df2c0883a7cea Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Fri, 4 Oct 2019 09:44:17 +0300 Subject: [PATCH] Fix default distro bwc tests --- qa/full-cluster-restart/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index 1dc5ddd1ace..6c5142d95dd 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -20,6 +20,7 @@ import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.RestTestRunnerTask +import org.elasticsearch.gradle.testclusters.TestDistribution apply plugin: 'elasticsearch.standalone-test' apply plugin: 'elasticsearch.testclusters' @@ -35,13 +36,18 @@ for (Version bwcVersion : bwcVersions.indexCompatible) { String baseName = "v${bwcVersion}" testClusters { + String configuredTestDistribution = System.getProperty('tests.distribution', 'oss').toUpperCase() "${baseName}" { + testDistribution = configuredTestDistribution versions = [ bwcVersion.toString(), project.version ] numberOfNodes = 2 // some tests rely on the translog not being flushed setting 'indices.memory.shard_inactive_time', '20m' setting 'http.content_type.required', 'true' setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}" + if (configuredTestDistribution.equals("DEFAULT")) { + setting "xpack.security.enabled", "false" + } javaHome = project.file(project.ext.runtimeJavaHome) } }