Skip to content

Commit 7d73c04

Browse files
authored
Disable ILM history in MP test suite (elastic#130729) (elastic#130760)
The ILM history store disturbs tests and was already disabled in the original `XPackRestIT`. We sync the cluster configuration of the multi-project test suite with the original one. Closes elastic#130307 Closes elastic#130360 Closes elastic#130568 Closes elastic#130672 Closes elastic#130677 (cherry picked from commit e574255) # Conflicts: # muted-tests.yml
1 parent aa57723 commit 7d73c04

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
2121
import org.junit.ClassRule;
2222

23+
import java.util.Objects;
24+
2325
@TimeoutSuite(millis = 60 * TimeUnits.MINUTE)
2426
public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProjectsClientYamlSuiteTestCase {
2527
@ClassRule
@@ -30,20 +32,28 @@ public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProj
3032
.setting("xpack.ml.enabled", "true")
3133
.setting("xpack.security.enabled", "true")
3234
.setting("xpack.watcher.enabled", "false")
33-
.setting("xpack.license.self_generated.type", "trial")
35+
// Integration tests are supposed to enable/disable exporters before/after each test
3436
.setting("xpack.security.authc.token.enabled", "true")
3537
.setting("xpack.security.authc.api_key.enabled", "true")
3638
.setting("xpack.security.transport.ssl.enabled", "true")
3739
.setting("xpack.security.transport.ssl.key", "testnode.pem")
3840
.setting("xpack.security.transport.ssl.certificate", "testnode.crt")
3941
.setting("xpack.security.transport.ssl.verification_mode", "certificate")
4042
.setting("xpack.security.audit.enabled", "true")
43+
.setting("xpack.license.self_generated.type", "trial")
44+
// disable ILM history, since it disturbs tests using _all
45+
.setting("indices.lifecycle.history_index_enabled", "false")
4146
.keystore("xpack.security.transport.ssl.secure_key_passphrase", "testnode")
4247
.configFile("testnode.pem", Resource.fromClasspath("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem"))
4348
.configFile("testnode.crt", Resource.fromClasspath("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt"))
4449
.configFile("service_tokens", Resource.fromClasspath("service_tokens"))
4550
.user(USER, PASS)
4651
.feature(FeatureFlag.TIME_SERIES_MODE)
52+
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
53+
.systemProperty("es.queryable_built_in_roles_enabled", () -> {
54+
final String enabled = System.getProperty("es.queryable_built_in_roles_enabled");
55+
return Objects.requireNonNullElse(enabled, "");
56+
})
4757
.build();
4858

4959
public XpackWithMultipleProjectsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

0 commit comments

Comments
 (0)