Skip to content

Commit 8927a1a

Browse files
authored
[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
1 parent 2006758 commit 8927a1a

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,3 @@ BuildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion,
3030
systemProperty("tests.old_cluster_version", bwcVersion)
3131
}
3232
}
33-
34-
35-
testClusters.configureEach {
36-
testDistribution = 'DEFAULT'
37-
numberOfNodes = 1
38-
setting 'xpack.license.self_generated.type', 'trial'
39-
}
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,11 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
8-
/*
9-
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
10-
* or more contributor license agreements. Licensed under the Elastic License
11-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
12-
* in compliance with, at your election, the Elastic License 2.0 or the Server
13-
* Side Public License, v 1.
14-
*/
157
package org.elasticsearch.xpack.application;
168

179
import com.carrotsearch.randomizedtesting.annotations.Name;
1810

11+
import org.elasticsearch.Version;
1912
import org.elasticsearch.client.Request;
2013
import org.elasticsearch.client.Response;
2114
import org.elasticsearch.test.cluster.ElasticsearchCluster;
@@ -28,6 +21,8 @@
2821
import java.io.IOException;
2922
import java.util.List;
3023

24+
import static org.elasticsearch.Version.V_8_12_0;
25+
3126
public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCase {
3227

3328
private static final Version DSL_DEFAULT_RETENTION_VERSION = V_8_12_0;
@@ -53,11 +48,11 @@ protected ElasticsearchCluster getUpgradeCluster() {
5348
return cluster;
5449
}
5550

51+
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/104470")
5652
public void testBehavioralAnalyticsDataRetention() throws Exception {
57-
5853
assumeTrue(
5954
"Data retention changed by default to DSL in " + DSL_DEFAULT_RETENTION_VERSION,
60-
getOldClusterTestVersion().before(DSL_DEFAULT_RETENTION_VERSION)
55+
getOldClusterTestVersion().before(DSL_DEFAULT_RETENTION_VERSION.toString())
6156
);
6257

6358
String legacyAnalyticsCollectionName = "oldstuff";

0 commit comments

Comments
 (0)