[Enterprise Search] Disable broken BA template in BwC test (#104635)

* Fix broken BA template in BwC test * Remove sout-s * Revert FeatureService injection * Skip failing BWC test * Use @AwaitsFix annotation * Fix linting
elastic · Jan 26, 2024 · 8927a1a · 8927a1a
1 parent 2006758
commit 8927a1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle
@@ -30,10 +30,3 @@ BuildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion,
     systemProperty("tests.old_cluster_version", bwcVersion)
   }
 }
-
-
-testClusters.configureEach {
-  testDistribution = 'DEFAULT'
-  numberOfNodes = 1
-  setting 'xpack.license.self_generated.type', 'trial'
-}
diff --git a/...ack/application/FullClusterRestartIT.java → ...ack/application/FullClusterRestartIT.java b/...ack/application/FullClusterRestartIT.java → ...ack/application/FullClusterRestartIT.java
@@ -4,18 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 package org.elasticsearch.xpack.application;
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
@@ -28,6 +21,8 @@
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.Version.V_8_12_0;
+
 public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCase {
 
     private static final Version DSL_DEFAULT_RETENTION_VERSION = V_8_12_0;
@@ -53,11 +48,11 @@ protected ElasticsearchCluster getUpgradeCluster() {
         return cluster;
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/104470")
     public void testBehavioralAnalyticsDataRetention() throws Exception {
-
         assumeTrue(
             "Data retention changed by default to DSL in " + DSL_DEFAULT_RETENTION_VERSION,
-            getOldClusterTestVersion().before(DSL_DEFAULT_RETENTION_VERSION)
+            getOldClusterTestVersion().before(DSL_DEFAULT_RETENTION_VERSION.toString())
         );
 
         String legacyAnalyticsCollectionName = "oldstuff";