From 460551b24d0eb3922360befd4ec6a96c08e403a4 Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Mon, 13 Oct 2025 10:42:33 +0200 Subject: [PATCH 1/3] Disable noisy FORK tests --- .../elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java index 2df8d40e0a095..902a123313fee 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java @@ -166,12 +166,7 @@ protected void shouldSkipTest(String testName) throws IOException { // Tests that do SORT before LOOKUP JOIN - not supported in CCS assumeFalse("LOOKUP JOIN after SORT not yet supported in CCS", testName.contains("OnTheCoordinator")); - if (testCase.requiredCapabilities.contains(FORK_V9.capabilityName())) { - assumeTrue( - "FORK not yet supported with CCS", - hasCapabilities(adminClient(), List.of(ENABLE_FORK_FOR_REMOTE_INDICES.capabilityName())) - ); - } + assumeFalse("FORK not yet supported with CCS", testCase.requiredCapabilities.contains(FORK_V9.capabilityName())); } private TestFeatureService remoteFeaturesService() throws IOException { From e2b07aa37f43a851acaf32eab54768ca76873fbe Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Mon, 13 Oct 2025 10:47:17 +0200 Subject: [PATCH 2/3] Remove tests from muted-tests.yml --- muted-tests.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index b065e52082e91..4fa05dc3420f1 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -453,9 +453,6 @@ tests: - class: org.elasticsearch.xpack.esql.plugin.CanMatchIT method: testAliasFilters issue: https://github.com/elastic/elasticsearch/issues/134512 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.FiveFork} - issue: https://github.com/elastic/elasticsearch/issues/134560 - class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT method: test {csv-spec:spatial.ConvertCartesianFromStringParseError} issue: https://github.com/elastic/elasticsearch/issues/134635 @@ -477,9 +474,6 @@ tests: - class: org.elasticsearch.xpack.esql.expression.function.scalar.score.DecayTests method: "testEvaluateBlockWithNulls {TestCase=, , , <_source> #2}" issue: https://github.com/elastic/elasticsearch/issues/134679 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkBeforeStatsByWithWhere} - issue: https://github.com/elastic/elasticsearch/issues/134817 - class: org.elasticsearch.repositories.blobstore.testkit.analyze.MinioRepositoryAnalysisRestIT method: testRepositoryAnalysis issue: https://github.com/elastic/elasticsearch/issues/134853 @@ -498,15 +492,9 @@ tests: - class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT method: test {csv-spec:stats.CountDistinctWithConditions} issue: https://github.com/elastic/elasticsearch/issues/134993 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkBeforeStatsWithWhere} - issue: https://github.com/elastic/elasticsearch/issues/135041 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeMetricsIT method: test issue: https://github.com/elastic/elasticsearch/issues/135055 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkWithStats} - issue: https://github.com/elastic/elasticsearch/issues/135116 - class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT method: testLookupExplosionBigString issue: https://github.com/elastic/elasticsearch/issues/135122 @@ -555,9 +543,6 @@ tests: - class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT method: testMatchAllQuery issue: https://github.com/elastic/elasticsearch/issues/135820 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkAfterEnrich} - issue: https://github.com/elastic/elasticsearch/issues/135830 - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT method: testOneRemoteClusterPartial issue: https://github.com/elastic/elasticsearch/issues/124055 @@ -570,15 +555,9 @@ tests: - class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT method: testHistogramAggregation issue: https://github.com/elastic/elasticsearch/issues/136002 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkWithFiltersOnConstantValues} - issue: https://github.com/elastic/elasticsearch/issues/136031 - class: org.elasticsearch.xpack.security.authz.microsoft.MicrosoftGraphAuthzPluginIT method: testConcurrentAuthentication issue: https://github.com/elastic/elasticsearch/issues/135777 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkBranchWithInlineStats} - issue: https://github.com/elastic/elasticsearch/issues/136091 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT method: test {csv-spec:date.EvalDateTruncQuarterlyIntervalWithGTInRange} issue: https://github.com/elastic/elasticsearch/issues/136102 From 1ffb20940ae2faa35b7cfb8695936ea07131c8a3 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 13 Oct 2025 08:58:16 +0000 Subject: [PATCH 3/3] [CI] Auto commit changes from spotless --- .../org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java index 902a123313fee..c917929dd83ce 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java @@ -48,7 +48,6 @@ import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.CSV_DATASET_MAP; import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES; import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources; -import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_FORK_FOR_REMOTE_INDICES; import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE; import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9; import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINE_STATS;