Use setting in integration test cluster config
This commit is contained in:
parent
4ee90db13d
commit
66ba044ec5
|
@ -73,8 +73,6 @@ class ClusterConfiguration {
|
||||||
return tmpFile.exists()
|
return tmpFile.exists()
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, String> esSettings = new HashMap<>();
|
|
||||||
|
|
||||||
Map<String, String> systemProperties = new HashMap<>()
|
Map<String, String> systemProperties = new HashMap<>()
|
||||||
|
|
||||||
Map<String, String> settings = new HashMap<>()
|
Map<String, String> settings = new HashMap<>()
|
||||||
|
@ -88,11 +86,6 @@ class ClusterConfiguration {
|
||||||
|
|
||||||
LinkedHashMap<String, Object[]> setupCommands = new LinkedHashMap<>()
|
LinkedHashMap<String, Object[]> setupCommands = new LinkedHashMap<>()
|
||||||
|
|
||||||
@Input
|
|
||||||
void esSetting(String setting, String value) {
|
|
||||||
esSettings.put(setting, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Input
|
@Input
|
||||||
void systemProperty(String property, String value) {
|
void systemProperty(String property, String value) {
|
||||||
systemProperties.put(property, value)
|
systemProperties.put(property, value)
|
||||||
|
|
|
@ -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
|
'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("-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(" "))
|
env.put('ES_JAVA_OPTS', config.systemProperties.collect { key, value -> "-D${key}=${value}" }.join(" "))
|
||||||
for (Map.Entry<String, String> property : System.properties.entrySet()) {
|
for (Map.Entry<String, String> property : System.properties.entrySet()) {
|
||||||
if (property.getKey().startsWith('es.')) {
|
if (property.getKey().startsWith('es.')) {
|
||||||
|
|
|
@ -28,8 +28,8 @@ dependencies {
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
esSetting 'es.script.inline', 'true'
|
setting 'script.inline', 'true'
|
||||||
esSetting 'es.script.indexed', 'true'
|
setting 'script.indexed', 'true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ dependencies {
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
esSetting 'es.script.inline', 'true'
|
setting 'script.inline', 'true'
|
||||||
esSetting 'es.script.indexed', 'true'
|
setting 'script.indexed', 'true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ dependencies {
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
esSetting 'es.script.inline', 'true'
|
setting 'script.inline', 'true'
|
||||||
esSetting 'es.script.indexed', 'true'
|
setting 'script.indexed', 'true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,8 +28,8 @@ dependencies {
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
esSetting 'es.script.inline', 'true'
|
setting 'script.inline', 'true'
|
||||||
esSetting 'es.script.indexed', 'true'
|
setting 'script.indexed', 'true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,6 @@ apply plugin: 'elasticsearch.rest-test'
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
esSetting 'es.node.ingest', 'false'
|
setting 'node.ingest', 'false'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,6 @@ apply plugin: 'elasticsearch.rest-test'
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
esSetting 'es.script.inline', 'true'
|
setting 'script.inline', 'true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue