Fixing tests that rely on feature flag (#138527)

Author: jonathan-buttner

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/CCMCrudIT.java

@@ -20,7 +20,9 @@
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.xpack.core.inference.action.PutCCMConfigurationAction;
+import org.elasticsearch.xpack.inference.services.elastic.ccm.CCMFeatureFlag;
 import org.junit.After;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 
 import java.io.IOException;
@@ -52,10 +54,19 @@ protected Settings restClientSettings() {
         return Settings.builder().put(ThreadContext.PREFIX + ".Authorization", token).build();
     }
 
+    @BeforeClass
+    public static void classSetup() {
+        assumeTrue("CCM is behind a feature flag and snapshot only right now", CCMFeatureFlag.FEATURE_FLAG.isEnabled());
+    }
+
     @After
-    public void cleanup() throws IOException {
-        // Disable CCM after each test to ensure a clean state
-        deleteCCMConfiguration();
+    public void cleanup() {
+        try {
+            // Disable CCM after each test to ensure a clean state
+            client().performRequest(new Request(DELETE_METHOD, INFERENCE_CCM_PATH));
+        } catch (Exception e) {
+            // ignore failures
+        }
     }
 
     public void testEnablesCCM_Succeeds() throws IOException {

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/CCMServiceIT.java

@@ -19,6 +19,7 @@
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceSettings;
 import org.elasticsearch.xpack.inference.services.elastic.authorization.AuthorizationTaskExecutor;
+import org.elasticsearch.xpack.inference.services.elastic.ccm.CCMFeatureFlag;
 import org.elasticsearch.xpack.inference.services.elastic.ccm.CCMModel;
 import org.elasticsearch.xpack.inference.services.elastic.ccm.CCMService;
 import org.elasticsearch.xpack.inference.services.elastic.ccm.CCMSettings;
@@ -73,6 +74,8 @@ public void delete(ActionListener<Void> listener) {
 
     @BeforeClass
     public static void initClass() throws IOException {
+        assumeTrue("CCM is behind a feature flag and snapshot only right now", CCMFeatureFlag.FEATURE_FLAG.isEnabled());
+
         webServer.start();
         gatewayUrl = getUrl(webServer);
     }