SERVER-58295 disable the aggregation_multiversion_fuzzer suite, and disable more tests

12 files changed, 32 insertions, 10 deletions

diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml
index 9590681eb42..f084d6f95ae 100644
--- a/buildscripts/resmokeconfig/suites/sharding.yml
+++ b/buildscripts/resmokeconfig/suites/sharding.yml
@@ -5,6 +5,9 @@ selector:
   - jstests/sharding/*.js
   - jstests/sharding/change_streams/*.js
   - jstests/sharding/query/*.js
+  exclude_files:
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml
index 4cb96d0addc..d8831664573 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth.yml
@@ -10,8 +10,6 @@ selector:
   - jstests/sharding/*.js
   - jstests/sharding/change_streams/*.js
   - jstests/sharding/query/*.js
-  exclude_with_any_tags:
-  - disabled_due_to_server_58295
   exclude_files:
   # Skip any tests that run with auth explicitly.
   - jstests/sharding/*[aA]uth*.js
@@ -35,6 +33,8 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
index 0dbf066af50..7a53ebd0290 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
@@ -10,8 +10,6 @@ selector:
   - jstests/sharding/*.js
   - jstests/sharding/change_streams/*.js
   - jstests/sharding/query/*.js
-  exclude_with_any_tags:
-  - disabled_due_to_server_58295
   exclude_files:
   # Skip any tests that run with auth explicitly.
   - jstests/sharding/*[aA]uth*.js
@@ -35,6 +33,8 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index 66915f6ba85..27b21af49b3 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -233,6 +233,9 @@ selector:
   # SERVER-51805 splitChunk op is not idempotent
   - jstests/sharding/mongos_get_shard_version.js
 
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
+
   exclude_with_any_tags:
   - does_not_support_stepdowns
 
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
index cc32647808f..cc7c04f7bf9 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/sharding/*.js
   - jstests/sharding/change_streams/*.js
   - jstests/sharding/query/*.js
+  exclude_files:
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml b/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml
index 1801cdfda6a..fa98d91897e 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/sharding/*.js
   - jstests/sharding/change_streams/*.js
   - jstests/sharding/query/*.js
+  exclude_files:
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml b/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml
index 08d894ecfc5..eb896e0acf4 100644
--- a/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml
@@ -7,6 +7,8 @@ selector:
   - jstests/sharding/query/*.js
   exclude_files:
   - jstests/sharding/query/mrShardedOutput.js
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog.yml b/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog.yml
index a6f5b6abb66..2c8f979823e 100644
--- a/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog.yml
@@ -5,6 +5,9 @@ selector:
   - jstests/sharding/*.js
   - jstests/sharding/change_streams/*.js
   - jstests/sharding/query/*.js
+  exclude_files:
+  # TODO SERVER-58696: Re-enable the below test.
+  - jstests/sharding/implicit_default_write_concern_add_shard.js
 
 executor:
   archive:
diff --git a/buildscripts/tests/test_burn_in_tags_evergreen.yml b/buildscripts/tests/test_burn_in_tags_evergreen.yml
index ac262b2e727..21292fade07 100644
--- a/buildscripts/tests/test_burn_in_tags_evergreen.yml
+++ b/buildscripts/tests/test_burn_in_tags_evergreen.yml
@@ -71,7 +71,8 @@ buildvariants:
     - rhel80-large
   - name: lint_pylinters
   - name: burn_in_tests_gen
-  - name: aggregation_multiversion_fuzzer_gen
+  # TODO SERVER-58718: Re-enable this suite.
+  # - name: aggregation_multiversion_fuzzer_gen
   - name: aggregation
   - name: burn_in_tags_gen
 - name: buildvariant-without-burn-in-tag-buildvariants
@@ -91,7 +92,8 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel80-large
-  - name: aggregation_multiversion_fuzzer_gen
+  # TODO SERVER-58718: Re-enable this suite.
+  # - name: aggregation_multiversion_fuzzer_gen
   - name: aggregation
 - name: enterprise-rhel-80-64-bit-inmem
   display_name: Enterprise RHEL 8.0 (inMemory)
@@ -134,5 +136,6 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel80-large
-  - name: aggregation_multiversion_fuzzer_gen
+  # TODO SERVER-58718: Re-enable this suite.
+  # - name: aggregation_multiversion_fuzzer_gen
   - name: aggregation
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 85e254ad720..3dd49c8fa36 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -3012,7 +3012,8 @@ tasks:
 ## Standalone generational fuzzer for multiversion aggregation pipelines ##
 - <<: *jstestfuzz_template
   name: aggregation_multiversion_fuzzer_gen
-  tags: ["aggfuzzer", "common", "multiversion"]
+  # TODO SERVER-58718: Re-enable this suite by un-commenting the 'tags' line.
+  # tags: ["aggfuzzer", "common", "multiversion"]
   commands:
   - func: "generate resmoke tasks"
     vars:
diff --git a/jstests/sharding/disable_resumable_range_deleter.js b/jstests/sharding/disable_resumable_range_deleter.js
index 8b2ad1236cb..d1209c3e4f0 100644
--- a/jstests/sharding/disable_resumable_range_deleter.js
+++ b/jstests/sharding/disable_resumable_range_deleter.js
@@ -3,7 +3,7 @@
  *
  * requires_persistence - This test restarts shards and expects them to remember their data.
  * requires_fcv_47 - This test changed the behavior of disableResumableRangeDeleter from 4.4.
- * @tags: [requires_persistence, requires_fcv_47]
+ * @tags: [requires_persistence, requires_fcv_47, disabled_due_to_server_58295]
  */
 (function() {
 
diff --git a/jstests/sharding/query/collation_lookup.js b/jstests/sharding/query/collation_lookup.js
index 9bc9bc862e9..106597ff986 100644
--- a/jstests/sharding/query/collation_lookup.js
+++ b/jstests/sharding/query/collation_lookup.js
@@ -8,7 +8,8 @@
  *
  * @tags: [
  *   requires_fcv_50,
- *   featureFlagShardedLookup
+ *   featureFlagShardedLookup,
+ *   disabled_due_to_server_58295
  * ]
  */
 (function() {