Merge branch 'main' into mapexpression-function-arg

fang-xing-esql · Dec 17, 2024 · a43cb3e · a43cb3e
2 parents 42dd838 + e1d06a8
commit a43cb3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -302,6 +302,9 @@ tests:
 - class: org.elasticsearch.xpack.ccr.rest.ShardChangesRestIT
   method: testShardChangesNoOperation
   issue: https://github.com/elastic/elasticsearch/issues/118800
+- class: org.elasticsearch.xpack.security.QueryableReservedRolesIT
+  method: testDeletingAndCreatingSecurityIndexTriggersSynchronization
+  issue: https://github.com/elastic/elasticsearch/issues/118806
 
 # Examples:
 #

diff --git a/...erence/src/yamlRestTest/resources/rest-api-spec/test/inference/45_semantic_text_match.yml b/...erence/src/yamlRestTest/resources/rest-api-spec/test/inference/45_semantic_text_match.yml
@@ -210,8 +210,6 @@ setup:
                 query: "inference test"
 
   - match: { hits.total.value: 2 }
-  - match: { hits.hits.0._id: "doc_1" }
-  - match: { hits.hits.1._id: "doc_2" }
 
   # Test querying multiple indices that either use the same inference ID or combine semantic_text with lexical search
   - do:
@@ -246,9 +244,6 @@ setup:
                 query: "inference test"
 
   - match: { hits.total.value: 3 }
-  - match: { hits.hits.0._id: "doc_1" }
-  - match: { hits.hits.1._id: "doc_3" }
-  - match: { hits.hits.2._id: "doc_2" }
 
 ---
 "Query a field that has no indexed inference results":