Skip to content

Commit 9854fdc

Browse files
authored
Add back gte version conditions on full restart tests (#117129)
Follow on from #116929. It is valid to do a full restart from any v8 cluster into a v9 cluster, so we need to maintain test conditions for those versions. Rather than historical versions, we can now use version features instead.
1 parent b89d578 commit 9854fdc

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

muted-tests.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -245,36 +245,6 @@ tests:
245245
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
246246
method: test {p0=snapshot/10_basic/Failed to snapshot indices with synthetic source}
247247
issue: https://github.com/elastic/elasticsearch/issues/117082
248-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
249-
method: testRollupIndex {cluster=OLD}
250-
issue: https://github.com/elastic/elasticsearch/issues/117084
251-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
252-
method: testRollupIndex {cluster=UPGRADED}
253-
issue: https://github.com/elastic/elasticsearch/issues/117086
254-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
255-
method: testNewReplicasTimeSeriesMode {cluster=OLD}
256-
issue: https://github.com/elastic/elasticsearch/issues/117087
257-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
258-
method: testNewReplicasTimeSeriesMode {cluster=UPGRADED}
259-
issue: https://github.com/elastic/elasticsearch/issues/117088
260-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
261-
method: testSearchTimeSeriesMode {cluster=OLD}
262-
issue: https://github.com/elastic/elasticsearch/issues/117089
263-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
264-
method: testSearchTimeSeriesMode {cluster=UPGRADED}
265-
issue: https://github.com/elastic/elasticsearch/issues/117090
266-
- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
267-
method: testNewReplicasTimeSeriesMode {cluster=OLD}
268-
issue: https://github.com/elastic/elasticsearch/issues/117091
269-
- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
270-
method: testSearchTimeSeriesMode {cluster=OLD}
271-
issue: https://github.com/elastic/elasticsearch/issues/117092
272-
- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
273-
method: testNewReplicasTimeSeriesMode {cluster=UPGRADED}
274-
issue: https://github.com/elastic/elasticsearch/issues/117093
275-
- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
276-
method: testSearchTimeSeriesMode {cluster=UPGRADED}
277-
issue: https://github.com/elastic/elasticsearch/issues/117094
278248
- class: org.elasticsearch.discovery.ClusterDisruptionIT
279249
method: testAckedIndexing
280250
issue: https://github.com/elastic/elasticsearch/issues/117024

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ private String getRollupIndexName() throws IOException {
268268
}
269269

270270
public void testRollupIndex() throws Exception {
271+
assumeTrue("Downsample got many stability improvements in 8.10.0", oldClusterHasFeature("gte_v8.10.0"));
271272
if (isRunningAgainstOldCluster()) {
272273
createIlmPolicy();
273274
createIndex();

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ public void testNewReplicas() throws Exception {
261261
}
262262

263263
public void testSearchTimeSeriesMode() throws Exception {
264+
assumeTrue("indexing time series indices changed in 8.2.0", oldClusterHasFeature("gte_v8.2.0"));
264265
int numDocs;
265266
if (isRunningAgainstOldCluster()) {
266267
numDocs = createTimeSeriesModeIndex(1);
@@ -298,6 +299,7 @@ public void testSearchTimeSeriesMode() throws Exception {
298299
}
299300

300301
public void testNewReplicasTimeSeriesMode() throws Exception {
302+
assumeTrue("indexing time series indices changed in 8.2.0", oldClusterHasFeature("gte_v8.2.0"));
301303
if (isRunningAgainstOldCluster()) {
302304
createTimeSeriesModeIndex(0);
303305
} else {

0 commit comments

Comments
 (0)