diff --git a/muted-tests.yml b/muted-tests.yml index 7dfc823d40d43..c3e3cd2ca5b29 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -615,81 +615,9 @@ tests: - class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests method: testGetAdditionalIndexSettingsMappingsMerging issue: https://github.com/elastic/elasticsearch/issues/135884 -- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT - method: testRollupIndex {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135906 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testNewReplicasTimeSeriesMode {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135907 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSingleDoc {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135908 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testResize {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135909 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSystemIndexMetadataIsUpgraded {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135923 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSearch {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135927 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testPeerRecoveryRetentionLeases {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135929 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testPersianAnalyzerBWC {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135930 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSnapshotRestore {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135933 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testForbidDisableSoftDeletesOnRestore {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135937 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testShrinkAfterUpgrade {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135938 - class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT method: testTopNPushedToLuceneOnSortedIndex issue: https://github.com/elastic/elasticsearch/issues/135939 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testClosedIndices {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135941 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testOperationBasedRecovery {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135944 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testRomanianAnalyzerBWC {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135948 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testEmptyShard {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135951 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testRollover {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135952 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testRecovery {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135953 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testNewReplicas {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135956 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testHistoryUUIDIsAdded {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135957 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testTurnOffTranslogRetentionAfterUpgraded {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135958 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSoftDeletes {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135959 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testClusterState {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135960 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testShrink {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135962 -- class: org.elasticsearch.upgrades.FullClusterRestartIT - method: testSearchTimeSeriesMode {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/135963 - class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests method: testGetAdditionalIndexSettings issue: https://github.com/elastic/elasticsearch/issues/135972 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"); }