Skip to content

Commit e574255

Browse files
authored
Disable ILM history in MP test suite (elastic#130729)
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
1 parent 0a336c9 commit e574255

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

muted-tests.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,6 @@ tests:
518518
- class: org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceExecutorTests
519519
method: testSuccessfulExecution
520520
issue: https://github.com/elastic/elasticsearch/issues/130306
521-
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
522-
method: test {yaml=cluster.stats/10_basic/Dense vector stats}
523-
issue: https://github.com/elastic/elasticsearch/issues/130307
524-
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
525-
method: test {yaml=nodes.stats/11_indices_metrics/Lucene segment level fields stats}
526-
issue: https://github.com/elastic/elasticsearch/issues/130360
527521
- class: org.elasticsearch.ingest.PipelineFactoryTests
528522
method: testCreateUnsupportedFieldAccessPattern
529523
issue: https://github.com/elastic/elasticsearch/issues/130422
@@ -536,9 +530,6 @@ tests:
536530
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
537531
method: testTopNPushedToLucene
538532
issue: https://github.com/elastic/elasticsearch/issues/130505
539-
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
540-
method: test {yaml=indices.resolve_index/10_basic_resolve_index/Resolve index with hidden and closed indices}
541-
issue: https://github.com/elastic/elasticsearch/issues/130568
542533
- class: org.elasticsearch.xpack.monitoring.exporter.http.HttpExporterTests
543534
method: testExporterWithHostOnly
544535
issue: https://github.com/elastic/elasticsearch/issues/130599
@@ -569,18 +560,12 @@ tests:
569560
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
570561
method: test {p0=search.vectors/41_knn_search_half_byte_quantized/Test create, merge, and search cosine}
571562
issue: https://github.com/elastic/elasticsearch/issues/130663
572-
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
573-
method: test {yaml=search.vectors/70_dense_vector_telemetry/Field mapping stats}
574-
issue: https://github.com/elastic/elasticsearch/issues/130672
575563
- class: org.elasticsearch.indices.stats.IndexStatsIT
576564
method: testFilterCacheStats
577565
issue: https://github.com/elastic/elasticsearch/issues/124447
578566
- class: org.elasticsearch.search.sort.FieldSortIT
579567
method: testSortMixedFieldTypes
580568
issue: https://github.com/elastic/elasticsearch/issues/129445
581-
- class: org.elasticsearch.multiproject.test.XpackWithMultipleProjectsClientYamlTestSuiteIT
582-
method: test {yaml=dlm/10_usage/Test data stream lifecycle usage stats}
583-
issue: https://github.com/elastic/elasticsearch/issues/130677
584569
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
585570
method: testStopQueryLocal
586571
issue: https://github.com/elastic/elasticsearch/issues/121672

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)