Enable mixed version testing of ES|QL semantic_text

ChrisHegarty · Oct 25, 2024 · 82a6381 · 82a6381
1 parent e7897bd
commit 82a6381
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 18 deletions.
diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle
@@ -22,6 +22,7 @@ restResources {
 dependencies {
   javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))
   javaRestTestImplementation project(xpackModule('esql:qa:server'))
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
 }
 
 GradleUtils.extendSourceSet(project, "javaRestTest", "yamlRestTest")

diff --git a/...r/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java b/...r/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java
@@ -23,6 +23,7 @@ public static ElasticsearchCluster mixedVersionCluster() {
             .setting("xpack.security.enabled", "false")
             .setting("xpack.license.self_generated.type", "trial")
             .setting("cluster.routing.rebalance.enable", "none") // disable relocation until we have retry in ESQL
+            .plugin("inference-service-test")
             .build();
     }
 }
diff --git a/...r/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java b/...r/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java
@@ -86,9 +86,4 @@ protected boolean supportsAsync() {
     protected boolean enableRoundingDoubleValuesOnAsserting() {
         return true;
     }
-
-    @Override
-    protected boolean supportsInferenceTestService() {
-        return false;
-    }
 }
diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/build.gradle b/x-pack/plugin/esql/qa/server/multi-clusters/build.gradle
@@ -15,6 +15,7 @@ apply plugin: 'elasticsearch.bwc-test'
 dependencies {
   javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))
   javaRestTestImplementation project(xpackModule('esql:qa:server'))
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
 }
 
 def supportedVersion = bwcVersion -> {

diff --git a/...erver/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/Clusters.java b/...erver/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/Clusters.java
@@ -27,6 +27,7 @@ public static ElasticsearchCluster remoteCluster() {
             .setting("xpack.license.self_generated.type", "trial")
             .shared(true)
             .setting("cluster.routing.rebalance.enable", "none")
+            .plugin("inference-service-test")
             .build();
     }
 
@@ -43,6 +44,7 @@ public static ElasticsearchCluster localCluster(ElasticsearchCluster remoteClust
             .setting("cluster.remote.connections_per_cluster", "1")
             .shared(true)
             .setting("cluster.routing.rebalance.enable", "none")
+            .plugin("inference-service-test")
             .build();
     }
 

diff --git a/...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java b/...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
@@ -261,9 +261,4 @@ static boolean hasIndexMetadata(String query) {
     protected boolean enableRoundingDoubleValuesOnAsserting() {
         return true;
     }
-
-    @Override
-    protected boolean supportsInferenceTestService() {
-        return false;
-    }
 }
diff --git a/...n/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java b/...n/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
@@ -132,7 +132,7 @@ protected EsqlSpecTestCase(
 
     @Before
     public void setup() throws IOException {
-        if (supportsInferenceTestService() && clusterHasInferenceEndpoint(client()) == false) {
+        if (clusterHasInferenceEndpoint(client()) == false) {
             createInferenceEndpoint(client());
         }
 
@@ -173,9 +173,6 @@ public final void test() throws Throwable {
     }
 
     protected void shouldSkipTest(String testName) throws IOException {
-        if (testCase.requiredCapabilities.contains("semantic_text_type")) {
-            assumeTrue("Inference test service needs to be supported for semantic_text", supportsInferenceTestService());
-        }
         checkCapabilities(adminClient(), testFeatureService, testName, testCase);
         assumeTrue("Test " + testName + " is not enabled", isEnabled(testName, instructions, Version.CURRENT));
     }
@@ -219,10 +216,6 @@ protected static void checkCapabilities(RestClient client, TestFeatureService te
         }
     }
 
-    protected boolean supportsInferenceTestService() {
-        return true;
-    }
-
     protected final void doTest() throws Throwable {
         RequestObjectBuilder builder = new RequestObjectBuilder(randomFrom(XContentType.values()));