Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Jan 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb062d3
Fix broken BA template in BwC test
demjened Jan 22, 2024
6f69da5
Remove sout-s
demjened Jan 24, 2024
f561cae
Revert FeatureService injection
demjened Jan 26, 2024
d7bdd1e
Skip failing BWC test
demjened Jan 26, 2024
76eeb42
Use @AwaitsFix annotation
demjened Jan 26, 2024
00bdad2
Fix linting
demjened Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
16 changes: 6 additions & 10 deletions ...ack/application/FullClusterRestartIT.java → ...ack/application/FullClusterRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -24,10 +17,13 @@
import org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus;
import org.elasticsearch.upgrades.ParameterizedFullClusterRestartTestCase;
import org.junit.ClassRule;
import org.junit.Ignore;

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;
Expand All @@ -53,11 +49,11 @@ protected ElasticsearchCluster getUpgradeCluster() {
return cluster;
}

@Ignore("https://github.com/elastic/elasticsearch/issues/104470")
demjened marked this conversation as resolved.
Show resolved Hide resolved
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";
Expand Down