From 66ba044ec569f76b6e2b03bfe7ba0912c44707df Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Tue, 15 Mar 2016 17:45:17 -0400
Subject: [PATCH] Use setting in integration test cluster config

---
 .../elasticsearch/gradle/test/ClusterConfiguration.groovy  | 7 -------
 .../groovy/org/elasticsearch/gradle/test/NodeInfo.groovy   | 1 -
 modules/lang-groovy/build.gradle                           | 4 ++--
 modules/lang-mustache/build.gradle                         | 4 ++--
 plugins/lang-javascript/build.gradle                       | 4 ++--
 plugins/lang-python/build.gradle                           | 4 ++--
 qa/smoke-test-ingest-disabled/build.gradle                 | 2 +-
 qa/smoke-test-reindex-with-groovy/build.gradle             | 2 +-
 8 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy
index 2adc59e9e9d..3e8b6225329 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy
@@ -73,8 +73,6 @@ class ClusterConfiguration {
         return tmpFile.exists()
     }
 
-    Map<String, String> esSettings = new HashMap<>();
-
     Map<String, String> systemProperties = new HashMap<>()
 
     Map<String, String> settings = new HashMap<>()
@@ -88,11 +86,6 @@ class ClusterConfiguration {
 
     LinkedHashMap<String, Object[]> setupCommands = new LinkedHashMap<>()
 
-    @Input
-    void esSetting(String setting, String value) {
-        esSettings.put(setting, value);
-    }
-
     @Input
     void systemProperty(String property, String value) {
         systemProperties.put(property, value)
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
index 168a67a4728..ebeb3d53895 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
@@ -130,7 +130,6 @@ class NodeInfo {
             'ES_GC_OPTS': config.jvmArgs // we pass these with the undocumented gc opts so the argline can set gc, etc
         ]
         args.addAll("-E", "es.node.portsfile=true")
-        args.addAll(config.esSettings.collectMany { key, value -> ["-E", "${key}=${value}" ] })
         env.put('ES_JAVA_OPTS', config.systemProperties.collect { key, value -> "-D${key}=${value}" }.join(" "))
         for (Map.Entry<String, String> property : System.properties.entrySet()) {
             if (property.getKey().startsWith('es.')) {
diff --git a/modules/lang-groovy/build.gradle b/modules/lang-groovy/build.gradle
index 340dd620ca6..884fe8b65ba 100644
--- a/modules/lang-groovy/build.gradle
+++ b/modules/lang-groovy/build.gradle
@@ -28,8 +28,8 @@ dependencies {
 
 integTest {
   cluster {
-    esSetting 'es.script.inline', 'true'
-    esSetting 'es.script.indexed', 'true'
+    setting 'script.inline', 'true'
+    setting 'script.indexed', 'true'
   }
 }
 
diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle
index 36b58792d86..8eed31dd668 100644
--- a/modules/lang-mustache/build.gradle
+++ b/modules/lang-mustache/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 
 integTest {
   cluster {
-    esSetting 'es.script.inline', 'true'
-    esSetting 'es.script.indexed', 'true'
+    setting 'script.inline', 'true'
+    setting 'script.indexed', 'true'
   }
 }
diff --git a/plugins/lang-javascript/build.gradle b/plugins/lang-javascript/build.gradle
index 41d85824318..1f431241838 100644
--- a/plugins/lang-javascript/build.gradle
+++ b/plugins/lang-javascript/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 
 integTest {
   cluster {
-    esSetting 'es.script.inline', 'true'
-    esSetting 'es.script.indexed', 'true'
+    setting 'script.inline', 'true'
+    setting 'script.indexed', 'true'
   }
 }
diff --git a/plugins/lang-python/build.gradle b/plugins/lang-python/build.gradle
index bc9db2a20c2..c7466316806 100644
--- a/plugins/lang-python/build.gradle
+++ b/plugins/lang-python/build.gradle
@@ -28,8 +28,8 @@ dependencies {
 
 integTest {
   cluster {
-    esSetting 'es.script.inline', 'true'
-    esSetting 'es.script.indexed', 'true'
+    setting 'script.inline', 'true'
+    setting 'script.indexed', 'true'
   }
 }
 
diff --git a/qa/smoke-test-ingest-disabled/build.gradle b/qa/smoke-test-ingest-disabled/build.gradle
index f8ebd631786..09b2d1409a1 100644
--- a/qa/smoke-test-ingest-disabled/build.gradle
+++ b/qa/smoke-test-ingest-disabled/build.gradle
@@ -21,6 +21,6 @@ apply plugin: 'elasticsearch.rest-test'
 
 integTest {
     cluster {
-        esSetting 'es.node.ingest', 'false'
+        setting 'node.ingest', 'false'
     }
 }
diff --git a/qa/smoke-test-reindex-with-groovy/build.gradle b/qa/smoke-test-reindex-with-groovy/build.gradle
index 749f5c1237c..c4b462ce45a 100644
--- a/qa/smoke-test-reindex-with-groovy/build.gradle
+++ b/qa/smoke-test-reindex-with-groovy/build.gradle
@@ -21,6 +21,6 @@ apply plugin: 'elasticsearch.rest-test'
 
 integTest {
   cluster {
-    esSetting 'es.script.inline', 'true'
+    setting 'script.inline', 'true'
   }
 }