SERVER-67791 Re-enable newer fcvs

14 files changed, 20 insertions, 12 deletions

diff --git a/jstests/multiVersion/targetedTestsLastLtsFeatures/fle2_downgrade.js b/jstests/multiVersion/targetedTestsLastLtsFeatures/fle2_downgrade.js
index 0808e2be307..6c9e495b31c 100644
--- a/jstests/multiVersion/targetedTestsLastLtsFeatures/fle2_downgrade.js
+++ b/jstests/multiVersion/targetedTestsLastLtsFeatures/fle2_downgrade.js
@@ -2,7 +2,8 @@
  * Tests that the cluster cannot be downgraded when encrypted fields present
  *
  * @tags: [
- * requires_fcv_60
+ * requires_fcv_60,
+ * __TEMPORARILY_DISABLED__,
  * ]
  */
 
@@ -44,8 +45,8 @@ function runTest(targetFCV) {
     assert.commandWorked(db.adminCommand({setFeatureCompatibilityVersion: latestFCV}));
 }
 
-targetFCV(lastLTSFCV);
-targetFCV(lastContinuousFCV);
+runTest(lastLTSFCV);
+runTest(lastContinuousFCV);
 
 rst.stopSet();
 }());
\ No newline at end of file
diff --git a/jstests/replsets/shard_merge_enabled.js b/jstests/replsets/shard_merge_enabled.js
index c5bee04e9bd..a3f1397bd12 100644
--- a/jstests/replsets/shard_merge_enabled.js
+++ b/jstests/replsets/shard_merge_enabled.js
@@ -1,6 +1,6 @@
 /**
  * Tests that the "shard merge" protocol is enabled only in the proper FCV.
- * @tags: [requires_fcv_52, featureFlagShardMerge]
+ * @tags: [requires_fcv_52, featureFlagShardMerge, __TEMPORARILY_DISABLED__]
  */
 
 (function() {
diff --git a/jstests/replsets/shard_merge_invalid_options.js b/jstests/replsets/shard_merge_invalid_options.js
index 4d7eee88a40..a4fdfc0d5d8 100644
--- a/jstests/replsets/shard_merge_invalid_options.js
+++ b/jstests/replsets/shard_merge_invalid_options.js
@@ -2,7 +2,7 @@
  * Tests that the donorStartMigration and recipientSyncData commands throw when a node has options
  * set that are incompatible with protocol shard merge.
  *
- * @tags: [requires_fcv_53, featureFlagShardMerge]
+ * @tags: [requires_fcv_53, featureFlagShardMerge, __TEMPORARILY_DISABLED__]
  * ]
  */
 
diff --git a/jstests/replsets/tenant_migration_advance_stable_ts_after_clone.js b/jstests/replsets/tenant_migration_advance_stable_ts_after_clone.js
index 144fb4645fb..56d75a3ada8 100644
--- a/jstests/replsets/tenant_migration_advance_stable_ts_after_clone.js
+++ b/jstests/replsets/tenant_migration_advance_stable_ts_after_clone.js
@@ -10,6 +10,7 @@
  *   requires_majority_read_concern,
  *   requires_persistence,
  *   serverless,
+ *   __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/replsets/tenant_migration_buildindex_shard_merge.js b/jstests/replsets/tenant_migration_buildindex_shard_merge.js
index 6b20abc906c..e18e266ed36 100644
--- a/jstests/replsets/tenant_migration_buildindex_shard_merge.js
+++ b/jstests/replsets/tenant_migration_buildindex_shard_merge.js
@@ -11,6 +11,7 @@
  *   serverless,
  *   featureFlagShardMerge,
  *   requires_fcv_53,
+ *   __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/replsets/tenant_migration_recipient_vote_imported_files.js b/jstests/replsets/tenant_migration_recipient_vote_imported_files.js
index 46383de1740..b1a489155b1 100644
--- a/jstests/replsets/tenant_migration_recipient_vote_imported_files.js
+++ b/jstests/replsets/tenant_migration_recipient_vote_imported_files.js
@@ -9,6 +9,7 @@
  *   requires_fcv_52,
  *   serverless,
  *   featureFlagShardMerge,
+ *   __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/sharding/cluster_chunks_resize_on_downgrade.js b/jstests/sharding/cluster_chunks_resize_on_downgrade.js
index 6065342cb00..a7a5656443c 100644
--- a/jstests/sharding/cluster_chunks_resize_on_downgrade.js
+++ b/jstests/sharding/cluster_chunks_resize_on_downgrade.js
@@ -2,7 +2,8 @@
  * Tests that chunks are re-split upon downgrade from v6.0.
  *
  * @tags: [
- *  requires_fcv_60
+ *  requires_fcv_60,
+ *  __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/sharding/listener_processing_server_status_metrics.js b/jstests/sharding/listener_processing_server_status_metrics.js
index 536bb51b0d7..e958548aefa 100644
--- a/jstests/sharding/listener_processing_server_status_metrics.js
+++ b/jstests/sharding/listener_processing_server_status_metrics.js
@@ -1,5 +1,5 @@
 /**
- *  @tags: [requires_fcv_60, featureFlagConnHealthMetrics]
+ *  @tags: [requires_fcv_60, featureFlagConnHealthMetrics, __TEMPORARILY_DISABLED__]
  *
  * Tests that listener processing times for connections are properly reported in server status
  * metrics. With each new connection to the same host, the value of the metric should always
diff --git a/jstests/sharding/max_time_ms_connection_pool.js b/jstests/sharding/max_time_ms_connection_pool.js
index f90d0b6f0c4..8fd1d345c40 100644
--- a/jstests/sharding/max_time_ms_connection_pool.js
+++ b/jstests/sharding/max_time_ms_connection_pool.js
@@ -4,7 +4,7 @@
  * `executor/connection_pool.cpp` into MaxTimeMSError when MaxTimeMS option is set for a given
  * sharding command.
  *
- * @tags: [requires_fcv_60]
+ * @tags: [requires_fcv_60, __TEMPORARILY_DISABLED__]
  */
 
 (function() {
diff --git a/jstests/sharding/range_deletions_setFCV.js b/jstests/sharding/range_deletions_setFCV.js
index a664e20ab54..d7d19d40097 100644
--- a/jstests/sharding/range_deletions_setFCV.js
+++ b/jstests/sharding/range_deletions_setFCV.js
@@ -4,7 +4,8 @@
  *
  * @tags: [
  *  uses_parallel_shell,
- *  requires_fcv_60
+ *  requires_fcv_60,
+ *  __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/sharding/timeseries_cluster_indexstats.js b/jstests/sharding/timeseries_cluster_indexstats.js
index 1e74b9b9cf2..975ad853f65 100644
--- a/jstests/sharding/timeseries_cluster_indexstats.js
+++ b/jstests/sharding/timeseries_cluster_indexstats.js
@@ -2,7 +2,8 @@
  * Tests that the $indexstats aggregation pipeline returns timeseries index statistics.
  *
  * @tags: [
- *   requires_fcv_51
+ *   requires_fcv_51,
+ *   __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/sharding/timeseries_indexes.js b/jstests/sharding/timeseries_indexes.js
index 5b9927e2f17..cf2f31193d0 100644
--- a/jstests/sharding/timeseries_indexes.js
+++ b/jstests/sharding/timeseries_indexes.js
@@ -4,6 +4,7 @@
  *
  * @tags: [
  *   requires_fcv_51,
+ *   __TEMPORARILY_DISABLED__,
  * ]
  */
 
diff --git a/jstests/sharding/verify_refine_collection_shard_key_opmessage.js b/jstests/sharding/verify_refine_collection_shard_key_opmessage.js
index c07544000b0..643b2355a13 100644
--- a/jstests/sharding/verify_refine_collection_shard_key_opmessage.js
+++ b/jstests/sharding/verify_refine_collection_shard_key_opmessage.js
@@ -1,7 +1,7 @@
 /**
  * Test that a special {op: 'n'} oplog event is created during refineCollectionShardKey command.
  *
- * @tags: [requires_fcv_60]
+ * @tags: [requires_fcv_60, __TEMPORARILY_DISABLED__]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/verify_reshard_collection_opmessage.js b/jstests/sharding/verify_reshard_collection_opmessage.js
index 305a75b4643..80453f60f80 100644
--- a/jstests/sharding/verify_reshard_collection_opmessage.js
+++ b/jstests/sharding/verify_reshard_collection_opmessage.js
@@ -1,7 +1,7 @@
 /**
  * Test that an opMessage is created during reshardCollection command.
  *
- * @tags: [requires_fcv_60]
+ * @tags: [requires_fcv_60, __TEMPORARILY_DISABLED__]
  */
 (function() {
 "use strict";