Use setting in integration test cluster config

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)

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.')) {

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'
   }
 }
 

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'
   }
 }

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'
   }
 }

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'
   }
 }
 

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'
     }
 }

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'
   }
 }