From b20d9d417ee67a8dee68a5ddb86413d40d9617f5 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 4 Jul 2025 09:38:53 +0200 Subject: [PATCH 1/7] Unmute 52_esql_insist_operator_synthetic_source.yml (#130528) and ensure this yaml test suite isn't run if build is not snapshot. Closes #130506 Closes #130507 Co-authored-by: Kostas Krikellas <131142368+kkrik-es@users.noreply.github.com> --- .../xpack/logsdb/LogsdbTestSuiteIT.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java b/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java index 9275c7936faff..72ba813055083 100644 --- a/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java +++ b/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java @@ -10,6 +10,7 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.Build; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; @@ -20,6 +21,9 @@ import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; import org.junit.ClassRule; +import java.util.ArrayList; +import java.util.List; + public class LogsdbTestSuiteIT extends ESClientYamlSuiteTestCase { private static final String USER = "test_admin"; @@ -43,7 +47,19 @@ public LogsdbTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + // Filter out 52_esql_insist_operator_synthetic_source.yml suite for snapshot builds: + // (esql doesn't use feature flags and all experimental features are just enabled if build is snapshot) + + List filtered = new ArrayList<>(); + for (Object[] params : ESClientYamlSuiteTestCase.createParameters()) { + ClientYamlTestCandidate candidate = (ClientYamlTestCandidate) params[0]; + if (candidate.getRestTestSuite().getName().equals("52_esql_insist_operator_synthetic_source") + && Build.current().isSnapshot() == false) { + continue; + } + filtered.add(new Object[] { candidate }); + } + return filtered; } @Override From c11a9012af3a49afdb3304ca220d5f62f21ffda0 Mon Sep 17 00:00:00 2001 From: Parker Timmins Date: Wed, 2 Jul 2025 10:55:22 -0500 Subject: [PATCH 2/7] fix version --- .../main/java/org/elasticsearch/test/cluster/FeatureFlag.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java index 3916d8b89aebb..a23a4b866998b 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java @@ -22,7 +22,7 @@ public enum FeatureFlag { USE_LUCENE101_POSTINGS_FORMAT("es.use_lucene101_postings_format_feature_flag_enabled=true", Version.fromString("9.1.0"), null), IVF_FORMAT("es.ivf_format_feature_flag_enabled=true", Version.fromString("9.1.0"), null), LOGS_STREAM("es.logs_stream_feature_flag_enabled=true", Version.fromString("9.1.0"), null), - PATTERNED_TEXT("es.patterned_text_feature_flag_enabled=true", Version.fromString("9.2.0"), null); + PATTERNED_TEXT("es.patterned_text_feature_flag_enabled=true", Version.fromString("9.1.0"), null); public final String systemProperty; public final Version from; From 68e9a5f666443a2d048dae6b107bd6e2245b4be2 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 4 Jul 2025 18:15:44 +0200 Subject: [PATCH 3/7] Mute esql usage yaml test #129888 --- muted-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/muted-tests.yml b/muted-tests.yml index 5253644557be7..2d28aed450a6a 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -551,6 +551,9 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution issue: https://github.com/elastic/elasticsearch/issues/130205 +- class: org.elasticsearch.xpack.test.rest.XPackRestIT + method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} + issue: https://github.com/elastic/elasticsearch/issues/129888 # Examples: # From 13f798314b3ee27e6191e60ed93f56f5c879c9ca Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 4 Jul 2025 19:37:12 +0200 Subject: [PATCH 4/7] adjust test mute --- muted-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/muted-tests.yml b/muted-tests.yml index 2032294fae7ba..8afa1370e98f8 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -548,7 +548,7 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution issue: https://github.com/elastic/elasticsearch/issues/130205 -- class: org.elasticsearch.xpack.test.rest.XPackRestIT +- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlI method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} issue: https://github.com/elastic/elasticsearch/issues/129888 From 7cc32c5d19b44489137a8d5d5c9fdba81ed1cbee Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 7 Jul 2025 06:05:56 +0200 Subject: [PATCH 5/7] tweak mute --- muted-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/muted-tests.yml b/muted-tests.yml index c9749b0446f7f..600bde8dcc257 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -548,7 +548,7 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution issue: https://github.com/elastic/elasticsearch/issues/130205 -- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlI +- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlIT method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} issue: https://github.com/elastic/elasticsearch/issues/129888 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT From b182e11f1c7fd47fa6acf95e3f06a75ca3dba3c0 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 7 Jul 2025 07:16:23 +0200 Subject: [PATCH 6/7] Update muted-tests.yml --- muted-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/muted-tests.yml b/muted-tests.yml index 600bde8dcc257..7f15587287b02 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -548,6 +548,9 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution issue: https://github.com/elastic/elasticsearch/issues/130205 +- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlClientYamlIT + method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} + issue: https://github.com/elastic/elasticsearch/issues/129888 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlIT method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} issue: https://github.com/elastic/elasticsearch/issues/129888 From 98851b47c7f35c19b3732bfb5dbb029fccb90537 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 7 Jul 2025 09:09:01 +0200 Subject: [PATCH 7/7] remove mutes --- muted-tests.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 7f15587287b02..fb1800e8657ea 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -548,12 +548,6 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution issue: https://github.com/elastic/elasticsearch/issues/130205 -- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlClientYamlIT - method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} - issue: https://github.com/elastic/elasticsearch/issues/129888 -- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlIT - method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} - issue: https://github.com/elastic/elasticsearch/issues/129888 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT method: test {p0=search.vectors/40_knn_search/Dimensions are dynamically set} issue: https://github.com/elastic/elasticsearch/issues/130626