SERVER-61671 temporarily remove tests for FCV 5.3

20 files changed, 67 insertions, 42 deletions

diff --git a/buildscripts/resmokeconfig/suites/auth_audit.yml b/buildscripts/resmokeconfig/suites/auth_audit.yml
index 5b5a0c507ae..91fdb6b3615 100644
--- a/buildscripts/resmokeconfig/suites/auth_audit.yml
+++ b/buildscripts/resmokeconfig/suites/auth_audit.yml
@@ -6,6 +6,8 @@ selector:
   exclude_files:
   # Skip until SERVER-25618 is resolved.
   - jstests/auth/repl.js
+  exclude_with_any_tags:
+  - disabled_due_to_server_61671
 
 # Auth tests start their own mongod's.
 executor:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
index 1caa8debaa8..4e5f0e97357 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
@@ -39,6 +39,7 @@ selector:
   - uses_transactions
   - requires_replication
   - requires_sharding
+  - disabled_due_to_server_61671
   group_size: 10
   group_count_multiplier: 2.5
 
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index 583c9b4ef73..a42676bf9d0 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -21,6 +21,7 @@ selector:
   - featureFlagToaster
   - featureFlagSpoon
   - disabled_due_to_server_60490
+  - disabled_due_to_server_61671
 
 # Multiversion tests start their own mongod's.
 executor:
diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
index 50492771ca7..0f4152ccf60 100644
--- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -29,6 +29,7 @@ selector:
   - featureFlagToaster
   - featureFlagSpoon
   - disabled_due_to_server_60490
+  - disabled_due_to_server_61671
 
 # Multiversion tests start their own mongod's.
 executor:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets.yml b/buildscripts/resmokeconfig/suites/replica_sets.yml
index cdaf2b828ef..08672013e4c 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets.yml
@@ -5,6 +5,8 @@ selector:
   - jstests/replsets/*.js
   - src/mongo/db/modules/enterprise/jstests/fcbis/*.js
   exclude_files:
+  exclude_with_any_tags:
+  - disabled_due_to_server_61671
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_auth.yml b/buildscripts/resmokeconfig/suites/replica_sets_auth.yml
index af1dc0d289c..b643419455b 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_auth.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_auth.yml
@@ -29,6 +29,8 @@ selector:
   - jstests/replsets/transactions_committed_with_tickets_exhausted.js
   # This test disables test commands which is incompatible with this suite.
   - jstests/replsets/test_only_repl_commands.js
+  exclude_with_any_tags:
+  - disabled_due_to_server_61671
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_ese.yml b/buildscripts/resmokeconfig/suites/replica_sets_ese.yml
index ea7eeece2a8..6c3eb45f26b 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_ese.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_ese.yml
@@ -10,6 +10,7 @@ selector:
   - src/mongo/db/modules/enterprise/jstests/fcbis/*.js
   exclude_with_any_tags:
   - does_not_support_encrypted_storage_engine
+  - disabled_due_to_server_61671
 executor:
   config:
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml b/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml
index 81c649f1736..356d3cda0af 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml
@@ -10,6 +10,7 @@ selector:
   - src/mongo/db/modules/enterprise/jstests/fcbis/*.js
   exclude_with_any_tags:
   - does_not_support_encrypted_storage_engine
+  - disabled_due_to_server_61671
 executor:
   config:
     shell_options:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml
index 9e7fbce6026..97d6ae931e1 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml
@@ -11,6 +11,7 @@ selector:
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
+  - disabled_due_to_server_61671
 
 run_hook_interval: &run_hook_interval 20
 executor:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
index f7d2966e471..758aa1638e1 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
@@ -6,6 +6,7 @@ selector:
   exclude_with_any_tags:
   # Transactions are not allowed to operate on capped collections.
   - requires_capped
+  - disabled_due_to_server_61671
   exclude_files:
 
 executor:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml b/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml
index a871411297b..469d97df635 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml
@@ -4,6 +4,8 @@ selector:
   roots:
   - jstests/replsets/*.js
   exclude_files:
+  exclude_with_any_tags:
+  - disabled_due_to_server_61671
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog.yml b/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog.yml
index 0d1dd1a5a57..0fc37bb2009 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog.yml
@@ -8,6 +8,8 @@ selector:
   - jstests/replsets/v2_delta_oplog_entries.js
   - jstests/replsets/rollback_with_coalesced_txn_table_updates_during_oplog_application.js
   - jstests/replsets/tenant_migration_recipient_fetches_retryable_writes_entry_after_committed_snapshot.js
+  exclude_with_any_tags:
+  - disabled_due_to_server_61671
 
 executor:
   config:
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 251d4de7c40..dd62411f42b 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -292,7 +292,7 @@ variables:
     - windows-vsCurrent-large
   - name: build_variant_gen
   - name: burn_in_tests_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: buildscripts_test
@@ -7360,7 +7360,7 @@ buildvariants:
     distros:
     - rhel80-xlarge
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: aggregation_auth
   - name: auth_gen
@@ -7399,7 +7399,7 @@ buildvariants:
     distros:
     - ubuntu1804-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: .misc_js
@@ -7475,7 +7475,7 @@ buildvariants:
     - ubuntu1804-build
   - name: build_variant_gen
   - name: .csfle
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore
@@ -7636,7 +7636,7 @@ buildvariants:
     distros:
     - ubuntu2004-large
   - name: build_variant_gen
-  - name: .aggfuzzer .common !.multiversion
+#  - name: .aggfuzzer .common !.multiversion # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: .misc_js
@@ -7694,7 +7694,7 @@ buildvariants:
     - ubuntu2004-large
   - name: build_variant_gen
   - name: .csfle
-  - name: .aggfuzzer .common !.multiversion
+#  - name: .aggfuzzer .common !.multiversion # Disabled for FCV 5.3
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore
@@ -7838,7 +7838,7 @@ buildvariants:
       - rhel80-xlarge
   - name: build_variant_gen
   - name: test_api_version_compatibility
-  - name: .aggfuzzer !.multiversion
+#  - name: .aggfuzzer !.multiversion # Disabled for FCV 5.3
   - name: .aggregation !.multiversion
   - name: audit
   - name: .auth !.multiversion
@@ -7970,7 +7970,7 @@ buildvariants:
     distros:
     - rhel80-xlarge
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation
   - name: audit
   - name: unittest_shell_hang_analyzer_gen
@@ -8103,7 +8103,7 @@ buildvariants:
     distros:
     - amazon1-2018-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.multiversion
   - name: audit
@@ -8160,7 +8160,7 @@ buildvariants:
     distros:
     - amazon1-2018-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -8219,7 +8219,7 @@ buildvariants:
     distros:
     - amazon2-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: audit
   - name: .auth !.multiversion
@@ -8275,7 +8275,7 @@ buildvariants:
     distros:
     - amazon2-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -8331,7 +8331,7 @@ buildvariants:
     distros:
     - amazon2-arm64-large
   - name: build_variant_gen
-  - name: .aggfuzzer !.multiversion
+#  - name: .aggfuzzer !.multiversion # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: auth_gen
@@ -8702,7 +8702,7 @@ buildvariants:
     distros:
     - windows-vsCurrent-large
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -8754,7 +8754,7 @@ buildvariants:
     distros:
     - windows-vsCurrent-large
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -8819,7 +8819,7 @@ buildvariants:
     distros:
     - windows-vsCurrent-large
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -9194,7 +9194,7 @@ buildvariants:
     distros:
     - rhel80-large
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation
   - name: audit
   - name: .auth
@@ -9317,7 +9317,7 @@ buildvariants:
   - name: burn_in_tests_gen
   - name: check_feature_flag_tags
   - name: check_for_todos
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation
   - name: audit
   - name: .auth
@@ -9453,7 +9453,7 @@ buildvariants:
       - rhel80-large
   - name: build_variant_gen
   - name: burn_in_tests_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation
   - name: audit
   - name: .auth
@@ -9562,7 +9562,7 @@ buildvariants:
     test_flags: >-
       --mongodSetParameters="{internalQueryForceClassicEngine: true}"
   tasks:
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation
   - name: .auth
   - name: .causally_consistent !.sharding
@@ -9858,7 +9858,7 @@ buildvariants:
     distros:
     - rhel70
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: auth_gen
@@ -9953,7 +9953,7 @@ buildvariants:
     distros:
     - rhel80-xlarge
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: auth_gen
@@ -10014,7 +10014,7 @@ buildvariants:
     distros:
     - rhel82-arm64-large
   - name: build_variant_gen
-  - name: .aggfuzzer !.multiversion
+#  - name: .aggfuzzer !.multiversion # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: auth_gen
@@ -10094,7 +10094,7 @@ buildvariants:
     distros:
     - rhel70
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: audit
   - name: auth_audit_gen
   - name: auth_gen
@@ -10579,7 +10579,7 @@ buildvariants:
     distros:
     - suse12-sp5-large
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
@@ -10626,7 +10626,7 @@ buildvariants:
     distros:
     - suse12-sp5-large
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -10678,7 +10678,7 @@ buildvariants:
     distros:
     - suse15-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common !.multiversion
+#  - name: .aggfuzzer .common !.multiversion # Disabled for FCV 5.3
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
@@ -10724,7 +10724,7 @@ buildvariants:
     distros:
     - suse15-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common !.multiversion
+#  - name: .aggfuzzer .common !.multiversion # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -10781,7 +10781,7 @@ buildvariants:
     distros:
     - debian92-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
@@ -10829,7 +10829,7 @@ buildvariants:
     distros:
     - debian92-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: aggregation_auth
   - name: .auth !.audit !.multiversion
@@ -10887,7 +10887,7 @@ buildvariants:
     distros:
     - debian10-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
   - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
@@ -10939,7 +10939,7 @@ buildvariants:
     distros:
     - debian10-build
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: aggregation
   - name: aggregation_auth
   - name: .auth !.audit !.multiversion
@@ -11004,7 +11004,7 @@ buildvariants:
     distros:
     - rhel80-xlarge
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: .aggregation !.unwind !.encrypt
   - name: audit
   - name: .auth !.multiversion
@@ -11071,7 +11071,7 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     # TODO (SERVER-58125): Re-enable the timeseries fuzzer for EFT
   - name: build_variant_gen
-  - name: .aggfuzzer .common !.timeseries
+#  - name: .aggfuzzer .common !.timeseries # Disabled for FCV 5.3
   - name: aggregation
   - name: .auth !.multiversion !.audit !.sharding
   # SERVER-58597: Re-enable parallel
@@ -11347,7 +11347,7 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: build_variant_gen
-  - name: .aggfuzzer .common
+#  - name: .aggfuzzer .common # Disabled for FCV 5.3
   - name: free_monitoring
   - name: .jstestfuzz !.initsync
 
@@ -11995,7 +11995,7 @@ buildvariants:
   tasks:
   - name: compile_and_archive_dist_test_TG
   - name: build_variant_gen
-  - name: .aggfuzzer
+#  - name: .aggfuzzer # Disabled for FCV 5.3
   - name: .aggregation
 #  - name: audit
 #  - name: .auth !.multiversion !.non_live_record
diff --git a/jstests/auth/logout_deprecated.js b/jstests/auth/logout_deprecated.js
index ec95cc3b9ad..00b2170daf4 100644
--- a/jstests/auth/logout_deprecated.js
+++ b/jstests/auth/logout_deprecated.js
@@ -5,6 +5,7 @@
  *   requires_auth,
  *   requires_non_retryable_commands,
  *   requires_sharding,
+ *   disabled_due_to_server_61671,
  * ]
  */
 (function() {
diff --git a/jstests/core/api_version_new_50_language_features.js b/jstests/core/api_version_new_50_language_features.js
index 553ce5447ee..7b283409f79 100644
--- a/jstests/core/api_version_new_50_language_features.js
+++ b/jstests/core/api_version_new_50_language_features.js
@@ -9,6 +9,7 @@
  *   requires_fcv_51,
  *   uses_api_parameters,
  *   requires_fcv_51,
+ *   disabled_due_to_server_61671,
  * ]
  */
 
diff --git a/jstests/core/unset2.js b/jstests/core/unset2.js
index e120ae2b674..e6c3feddfdb 100644
--- a/jstests/core/unset2.js
+++ b/jstests/core/unset2.js
@@ -1,7 +1,7 @@
 // Cannot implicitly shard accessed collections because of following errmsg: A single
 // update/delete on a sharded collection must contain an exact match on _id or contain the shard
 // key.
-// @tags: [assumes_unsharded_collection]
+// @tags: [assumes_unsharded_collection, disabled_due_to_server_61671]
 
 var res;
 
diff --git a/jstests/multiVersion/clustered_collection.js b/jstests/multiVersion/clustered_collection.js
index be91b5f0942..c31ce33d484 100644
--- a/jstests/multiVersion/clustered_collection.js
+++ b/jstests/multiVersion/clustered_collection.js
@@ -7,7 +7,7 @@
  * large binary string RecordId encoding on time series collection, this test case is useful for
  * validating the RecordId KeyString encoding behaviour across versions.
  *
- * @tags: [future_git_tag_incompatible]
+ * @tags: [future_git_tag_incompatible, disabled_due_to_server_61671]
  *
  */
 
diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js
index 19a5e7eae83..83e1ee2f0e8 100644
--- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js
+++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js
@@ -1,7 +1,11 @@
 /**
  * Tests that we note down the recipient FCV at the beginning of a migration and that a change
  * in that FCV will abort the migration.
- * @tags: [requires_majority_read_concern, incompatible_with_windows_tls]
+ * @tags: [
+ *  requires_majority_read_concern,
+ *  incompatible_with_windows_tls,
+ *  disabled_due_to_server_61671,
+ *  ]
  */
 
 (function() {
@@ -84,4 +88,4 @@ runTest(lastContinuousFCV);
 if (lastContinuousFCV != lastLTSFCV) {
     runTest(lastLTSFCV);
 }
-})();
\ No newline at end of file
+})();
diff --git a/jstests/multiVersion/upgrade_downgrade_timeseries_collection_from_last_continuous.js b/jstests/multiVersion/upgrade_downgrade_timeseries_collection_from_last_continuous.js
index b6d5af7ce7e..d4e9039a5de 100644
--- a/jstests/multiVersion/upgrade_downgrade_timeseries_collection_from_last_continuous.js
+++ b/jstests/multiVersion/upgrade_downgrade_timeseries_collection_from_last_continuous.js
@@ -3,6 +3,8 @@
  * potentially mixed-schema data when building secondary indexes on time-series measurements on the
  * latest binary. Additionally, tests that downgrading FCV from 5.2 removes the
  * 'timeseriesBucketsMayHaveMixedSchemaData' catalog entry flag from time-series collections.
+ *
+ * @tags: [disabled_due_to_server_61671]
  */
 (function() {
 "use strict";
@@ -120,4 +122,4 @@ assert(
     checkLog.checkContainsWithCountJson(secondary, 6057601, {setting: null}, /*expectedCount=*/1));
 
 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 0235f79ea00..a7e23ed5a99 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, disabled_due_to_server_61671]
  */
 
 (function() {