Merge branch 'main' into SearchWithRejectionsIT_testOpenContextsAfterRejections

Author: drempapis

muted-tests.yml

@@ -581,12 +581,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
   method: testTopNPushedToLucene
   issue: https://github.com/elastic/elasticsearch/issues/130505
-- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
-  method: test {yaml=/52_esql_insist_operator_synthetic_source/FROM with INSIST_🐔and LIMIT 1}
-  issue: https://github.com/elastic/elasticsearch/issues/130506
-- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
-  method: test {yaml=/52_esql_insist_operator_synthetic_source/FROM with INSIST_🐔}
-  issue: https://github.com/elastic/elasticsearch/issues/130507
 - class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests
   method: testGetSystemTrustStoreWithNoSystemProperties
   issue: https://github.com/elastic/elasticsearch/issues/130517

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<Object[]> 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<Object[]> 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