Merge branch 'main' into ml-cpp-release-notes

szabosteve · web-flow · commit 0c89989080c2 · 2025-04-07T18:47:18.000+02:00
diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
@@ -177,7 +177,7 @@ public final void test() throws Throwable {
     }
 
     protected void shouldSkipTest(String testName) throws IOException {
-        if (testCase.requiredCapabilities.contains("semantic_text_field_caps")) {
+        if (testCase.requiredCapabilities.contains("semantic_text_field_caps") || testCase.requiredCapabilities.contains("rerank")) {
             assumeTrue("Inference test service needs to be supported for semantic_text", supportsInferenceTestService());
         }
         checkCapabilities(adminClient(), testFeatureService, testName, testCase);

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public final void test() throws Throwable {`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`protected void shouldSkipTest(String testName) throws IOException {`
`180`		`- if (testCase.requiredCapabilities.contains("semantic_text_field_caps")) {`
	`180`	`+ if (testCase.requiredCapabilities.contains("semantic_text_field_caps") \|\| testCase.requiredCapabilities.contains("rerank")) {`
`181`	`181`	`assumeTrue("Inference test service needs to be supported for semantic_text", supportsInferenceTestService());`
`182`	`182`	`}`
`183`	`183`	`checkCapabilities(adminClient(), testFeatureService, testName, testCase);`