diff --git a/muted-tests.yml b/muted-tests.yml index a3126193b6523..dfbc53a94d39e 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -449,33 +449,6 @@ tests: - class: org.elasticsearch.aggregations.bucket.AggregationReductionCircuitBreakingIT method: testCBTrippingOnReduction issue: https://github.com/elastic/elasticsearch/issues/134902 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testEmptyShard {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135951 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSearch {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135927 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testPersianAnalyzerBWC {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135930 -- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT - method: testRollupIndex {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135906 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSystemIndexMetadataIsUpgraded {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135923 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testNewReplicas {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135956 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testPeerRecoveryRetentionLeases {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135929 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testTurnOffTranslogRetentionAfterUpgraded {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135958 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testOperationBasedRecovery {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135944 # Examples: # diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java index 10bbd3dc42e67..3a65f10e07d77 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java @@ -57,7 +57,7 @@ private static ElasticsearchCluster buildCluster() { .apply(() -> clusterConfig) .feature(FeatureFlag.TIME_SERIES_MODE); - if (oldVersion.before(Version.fromString("8.18.0"))) { + if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); } diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index b0fda4051bf4b..b5a0928cb21a7 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -118,7 +118,7 @@ private static ElasticsearchCluster buildCluster() { .apply(() -> clusterConfig) .feature(FeatureFlag.TIME_SERIES_MODE); - if (oldVersion.before(Version.fromString("8.18.0"))) { + if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) { cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper"); cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService"); }