diff --git a/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java b/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java index 0977eaddd7e06..a5581ef922736 100644 --- a/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java +++ b/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java @@ -20,6 +20,8 @@ import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; import org.junit.ClassRule; +import java.util.Objects; + @TimeoutSuite(millis = 60 * TimeUnits.MINUTE) public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProjectsClientYamlSuiteTestCase { @ClassRule @@ -30,7 +32,7 @@ public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProj .setting("xpack.ml.enabled", "true") .setting("xpack.security.enabled", "true") .setting("xpack.watcher.enabled", "false") - .setting("xpack.license.self_generated.type", "trial") + // Integration tests are supposed to enable/disable exporters before/after each test .setting("xpack.security.authc.token.enabled", "true") .setting("xpack.security.authc.api_key.enabled", "true") .setting("xpack.security.transport.ssl.enabled", "true") @@ -38,12 +40,20 @@ public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProj .setting("xpack.security.transport.ssl.certificate", "testnode.crt") .setting("xpack.security.transport.ssl.verification_mode", "certificate") .setting("xpack.security.audit.enabled", "true") + .setting("xpack.license.self_generated.type", "trial") + // disable ILM history, since it disturbs tests using _all + .setting("indices.lifecycle.history_index_enabled", "false") .keystore("xpack.security.transport.ssl.secure_key_passphrase", "testnode") .configFile("testnode.pem", Resource.fromClasspath("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem")) .configFile("testnode.crt", Resource.fromClasspath("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt")) .configFile("service_tokens", Resource.fromClasspath("service_tokens")) .user(USER, PASS) .feature(FeatureFlag.TIME_SERIES_MODE) + .feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED) + .systemProperty("es.queryable_built_in_roles_enabled", () -> { + final String enabled = System.getProperty("es.queryable_built_in_roles_enabled"); + return Objects.requireNonNullElse(enabled, ""); + }) .build(); public XpackWithMultipleProjectsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {