SERVER-70339 aggregate sharding resmoke suites

22 files changed, 189 insertions, 199 deletions

diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_auth_audit.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_auth_audit.yml
new file mode 100644
index 00000000000..53f62b0aa76
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_auth_audit.yml
@@ -0,0 +1,4 @@
+- suite_name: sharding_auth_audit
+  base_suite: sharding_auth
+  overrides:
+    - "audit.enable"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_ese.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_ese.yml
new file mode 100644
index 00000000000..7841cb510d0
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_ese.yml
@@ -0,0 +1,8 @@
+# This suite should not be run in evergreen, it is combined into
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese
+- suite_name: sharding_ese
+  base_suite: sharding
+  overrides:
+    - "encryption.testdata_ese"
+  excludes:
+    - "encryption.excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_ese_gcm.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_ese_gcm.yml
new file mode 100644
index 00000000000..cb891a2cf03
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_ese_gcm.yml
@@ -0,0 +1,9 @@
+# This suite should not be run in evergreen, it is combined into
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm
+- suite_name: sharding_ese_gcm
+  base_suite: sharding
+  overrides:
+    - "encryption.testdata_ese"
+    - "encryption.testdata_gcm"
+  excludes:
+    - "encryption.excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring.yml
new file mode 100644
index 00000000000..65d7e83a60a
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring.yml
@@ -0,0 +1,11 @@
+# This suite should not be run in evergreen, it is combined into
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese
+# sharding_max_mirroring_opportunistic_secondary_targeting
+- suite_name: sharding_max_mirroring
+  base_suite: sharding
+  overrides:
+    - "max_mirroring.enable"
+    - "archive.no_archive"
+  excludes:
+    - "max_mirroring.sharding_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting.yml
new file mode 100644
index 00000000000..e8e9d617d02
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting.yml
@@ -0,0 +1,12 @@
+- suite_name: sharding_max_mirroring_opportunistic_secondary_targeting
+  base_suite: sharding
+  description: >-
+    This suite is a combination of sharding_max_mirroring, and
+    sharding_opportunistic_secondary_targeting. You can run any of these tests individually to
+    debug any issues that might arrise.
+  overrides:
+    - "archive.no_archive"
+    - "max_mirroring.enable"
+    - "opportunistic_secondary_targeting.enable"
+  excludes:
+    - "max_mirroring.sharding_excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting_ese.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting_ese.yml
new file mode 100644
index 00000000000..7e95052b885
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting_ese.yml
@@ -0,0 +1,17 @@
+# This suite should not be run in any other variants that include
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm or
+# sharding_max_mirroring_opportunistic_secondary_targeting.
+# sharding_ese should be run in these cases instead.
+- suite_name: sharding_max_mirroring_opportunistic_secondary_targeting_ese
+  base_suite: sharding
+  description: >-
+    This suite is a combination of sharding_max_mirroring, sharding_ese, and
+    sharding_opportunistic_secondary_targeting. You can run any of these tests individually to
+    debug any issues that might arrise.
+  overrides:
+    - "max_mirroring.enable"
+    - "opportunistic_secondary_targeting.enable"
+    - "encryption.testdata_ese"
+  excludes:
+    - "max_mirroring.sharding_excluded_files"
+    - "encryption.excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm.yml
new file mode 100644
index 00000000000..b34bb5c2577
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm.yml
@@ -0,0 +1,14 @@
+- suite_name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm
+  base_suite: sharding
+  description: >-
+    This suite is a combination of sharding_max_mirroring, sharding_ese_gcm, and
+    sharding_opportunistic_secondary_targeting. You can run any of these tests individually to
+    debug any issues that might arrise.
+  overrides:
+    - "max_mirroring.enable"
+    - "opportunistic_secondary_targeting.enable"
+    - "encryption.testdata_ese"
+    - "encryption.testdata_gcm"
+  excludes:
+    - "max_mirroring.sharding_excluded_files"
+    - "encryption.excluded_files"
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_opportunistic_secondary_targeting.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_opportunistic_secondary_targeting.yml
new file mode 100644
index 00000000000..175c63dd59c
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_opportunistic_secondary_targeting.yml
@@ -0,0 +1,9 @@
+# This suite should not be run in evergreen, it is combined into
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese
+# sharding_max_mirroring_opportunistic_secondary_targeting
+- suite_name: sharding_opportunistic_secondary_targeting
+  base_suite: sharding
+  overrides:
+    - "opportunistic_secondary_targeting.enable"
+    - "archive.no_archive"
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml
index 7609fb306a9..f727f2d5452 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml
@@ -1,3 +1,8 @@
+- name: no_archive
+  value:
+    executor:
+      archive: null
+
 - name: tests
   value:
     executor:
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/audit.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/audit.yml
new file mode 100644
index 00000000000..f04c78aaef6
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/audit.yml
@@ -0,0 +1,11 @@
+### Overrides for matrix suites that include auditDestination ###
+- name: enable
+  value:
+    executor:
+      config:
+        shell_options:
+          global_vars:
+            TestData:
+              auditDestination: 'console'
+              setParameters:
+                receiveChunkWaitForRangeDeleterTimeoutMS: 90000
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml
index a46fa12583e..7c28f70c211 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml
@@ -8,3 +8,8 @@
             TestData:
               setParameters:
                 mirrorReads: "{samplingRate: 1.0}"
+
+- name: sharding_excluded_files
+  value:
+    exclude_files:
+    - jstests/sharding/query/mrShardedOutput.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/opportunistic_secondary_targeting.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/opportunistic_secondary_targeting.yml
new file mode 100644
index 00000000000..c6d3dc9272a
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/opportunistic_secondary_targeting.yml
@@ -0,0 +1,10 @@
+### Overrides for matrix suites that include opportunistic secondary targeting
+- name: enable
+  value:
+    executor:
+      config:
+        shell_options:
+          global_vars:
+            TestData:
+              setParametersMongos:
+                opportunisticSecondaryTargeting: true
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
deleted file mode 100644
index 5901dd5ee4c..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/**/*.js
-  exclude_files:
-  - jstests/sharding/**/libs/**/*.js
-  # Skip any tests that run with auth explicitly.
-  - jstests/sharding/*[aA]uth*.js
-  - jstests/sharding/query/*[aA]uth*.js
-  - jstests/sharding/change_streams/*[aA]uth*.js
-
-  - jstests/sharding/advance_cluster_time_action_type.js
-  - jstests/sharding/query/aggregation_currentop.js
-  - jstests/sharding/internal_txns/internal_client_restrictions.js
-  - jstests/sharding/kill_sessions.js
-  # Skip these additional tests when running with auth enabled.
-  - jstests/sharding/parallel.js
-  # Skip the testcases that do not have auth bypass when running ops in parallel.
-  - jstests/sharding/migration_with_source_ops.js                     # SERVER-21713
-  - jstests/sharding/migration_sets_fromMigrate_flag.js               # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_1.js                 # SERVER-21713
-  - jstests/sharding/migration_ignore_interrupts_2.js                 # SERVER-21713
-  - jstests/sharding/movechunk_parallel.js                            # SERVER-21713
-  - jstests/sharding/migration_server_status.js                       # SERVER-21713
-  - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
-  # Runs with auth enabled.
-  - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
-  # Skip because this suite implicitly authenticates as __system, which allows bypassing user write
-  # blocking.
-  - jstests/sharding/set_user_write_block_mode.js
-
-executor:
-  archive:
-    tests:
-      - jstests/sharding/*reshard*.js
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auditDestination: 'console'
-          auth: true
-          authMechanism: SCRAM-SHA-256
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-          roleGraphInvalidationIsFatal: true
-          setParameters:
-            receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-      nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
deleted file mode 100644
index 4d2ff9f8d7d..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_ese.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/**/*.js
-  exclude_files:
-  - jstests/sharding/**/libs/**/*.js
-  exclude_with_any_tags:
-  - does_not_support_encrypted_storage_engine
-executor:
-  archive:
-    tests:
-      - jstests/sharding/*reshard*.js
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          enableEncryption: ''
-          encryptionKeyFile: *keyFile
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml b/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml
deleted file mode 100644
index c16f675c1f2..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_ese_gcm.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Section that is ignored by resmoke.py.
-config_variables:
-- &keyFile src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2
-
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/**/*.js
-  exclude_files:
-  - jstests/sharding/**/libs/**/*.js
-  exclude_with_any_tags:
-  - does_not_support_encrypted_storage_engine
-executor:
-  archive:
-    tests:
-      - jstests/sharding/*reshard*.js
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          enableEncryption: ''
-          encryptionKeyFile: *keyFile
-          encryptionCipherMode: 'AES256-GCM'
diff --git a/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml b/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml
deleted file mode 100644
index d7716301c55..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_max_mirroring.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/**/*.js
-  exclude_files:
-  - jstests/sharding/**/libs/**/*.js
-  - jstests/sharding/query/mrShardedOutput.js
-
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          setParameters:
-            mirrorReads: "{samplingRate: 1.0}"
diff --git a/buildscripts/resmokeconfig/suites/sharding_opportunistic_secondary_targeting.yml b/buildscripts/resmokeconfig/suites/sharding_opportunistic_secondary_targeting.yml
deleted file mode 100644
index 25fd82af0f7..00000000000
--- a/buildscripts/resmokeconfig/suites/sharding_opportunistic_secondary_targeting.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-  - jstests/sharding/**/*.js
-  exclude_files:
-  - jstests/sharding/**/libs/**/*.js
-
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      global_vars:
-        TestData:
-          setParametersMongos:
-            opportunisticSecondaryTargeting: true
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index c934bfb6e76..dd7239ec764 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -206,7 +206,6 @@ variables:
   - name: .logical_session_cache
   - name: replica_sets_auth_gen
   - name: sasl
-  - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
 
 # TODO: SERVER-XYZ remove this duplicate task definition.
@@ -274,7 +273,6 @@ variables:
   - name: search_auth
   - name: search_ssl
   - name: sharding_auth_audit_gen
-  - name: sharding_auth_gen
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
@@ -318,6 +316,7 @@ buildvariants:
   tasks:
   - name: .aggregation !.encrypt
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: .causally_consistent !.wo_snapshot
   - name: .change_streams !.secondary_reads
   - name: .clustered_collections
@@ -344,7 +343,7 @@ buildvariants:
   - name: sharded_multi_stmt_txn_jscore_passthrough
   - name: .sharding .jscore !.wo_snapshot
   - name: sharding_gen
-  - name: sharding_opportunistic_secondary_targeting_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
 
 - <<: *linux-64-debug-required-template
   name: &linux-64-debug-wtdevelop linux-64-debug-wtdevelop
@@ -844,7 +843,7 @@ buildvariants:
     - windows-vsCurrent-large
   - name: session_jscore_passthrough
   - name: sharding_gen
-  - name: sharding_opportunistic_secondary_targeting_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
   - name: .stitch
   - name: server_discovery_and_monitoring_json_test_TG
   - name: server_selection_json_test_TG
@@ -905,9 +904,8 @@ buildvariants:
     - windows-vsCurrent-large
   - name: sasl
   - name: .sharding .txns
-  - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gen
 
 - <<: *enterprise-windows-template
   name: &enterprise-windows-all-feature-flags-required enterprise-windows-all-feature-flags-required
@@ -972,10 +970,8 @@ buildvariants:
   - name: replica_sets_jscore_passthrough_gen
   - name: sasl
   - name: .sharding .txns
-  - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_opportunistic_secondary_targeting_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gen
   - name: telemetry_passthrough
   - name: unittest_shell_hang_analyzer_gen
 
@@ -1043,7 +1039,7 @@ buildvariants:
   - name: replica_sets_jscore_passthrough_gen
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt !.multiversion
   - name: .sharding .txns !.multiversion
-  - name: .sharding .common !.csrs !.multiversion
+  - name: .sharding .common !.csrs !.multiversion !.gcm
   - name: .ssl
   - name: .stitch
   - name: .updatefuzzer !.multiversion
@@ -1634,7 +1630,7 @@ buildvariants:
   - name: .sharding .common
   - name: sharded_multi_stmt_txn_jscore_passthrough
   - name: .serverless
-  - name: sharding_opportunistic_secondary_targeting_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen
   - name: .updatefuzzer
   - name: secondary_reads_passthrough_gen
   - name: .shard_split
@@ -1797,10 +1793,9 @@ buildvariants:
   - name: .rollbackfuzzer
   - name: .sharding .txns
   - name: sharding_gen
-  - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen
   - name: sharding_csrs_continuous_config_stepdown_gen
   - name: sharded_multi_stmt_txn_jscore_passthrough
     distros:
@@ -1924,7 +1919,6 @@ buildvariants:
   - name: search_auth
   - name: search_ssl
   - name: sharding_auth_audit_gen
-  - name: sharding_auth_gen
   - name: .stitch
   - name: test_packages
     distros:
@@ -2088,7 +2082,6 @@ buildvariants:
   - name: search_auth
   - name: search_ssl
   - name: sharding_auth_audit_gen
-  - name: sharding_auth_gen
   - name: .stitch
 
 - name: &ubuntu1804-container ubuntu1804-container
@@ -2291,7 +2284,7 @@ buildvariants:
   - name: .serverless
     distros:
     - amazon2-arm64-large
-  - name: sharding_opportunistic_secondary_targeting_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen
   - name: .updatefuzzer
   - name: secondary_reads_passthrough_gen
   - name: .shard_split
@@ -2386,7 +2379,8 @@ buildvariants:
   - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
   - name: .sharding .jscore !.wo_snapshot
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
   - name: .serverless
   - name: .watchdog
   - name: .stitch
@@ -2829,7 +2823,7 @@ buildvariants:
   # - name: sharding_api_version_jscore_passthrough_gen # Not passing
   # - name: .sharding .txns # Not passing
   # - name: .sharding .common # Not passing
-  # - name: sharding_opportunistic_secondary_targeting_gen # Not passing
+  # - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen # Not passing
   - name: .stitch
   # - name: .crypt # Doesn't pass on v4
   #   distros:
@@ -2911,7 +2905,7 @@ buildvariants:
   - name: sharding_api_version_jscore_passthrough_gen
   - name: .sharding .txns
   - name: .sharding .common
-  - name: sharding_opportunistic_secondary_targeting_gen
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen
   # - name: .crypt # Doesn't pass on v4
   #   distros:
   #   - rhel80-xlarge
@@ -3007,7 +3001,7 @@ buildvariants:
     distros:
     - rhel80-build
   - name: .aggregation !.no_async
-  - name: .sharding .auth
+  - name: sharding_auth_gen
   - name: .sharding .causally_consistent !.wo_snapshot
   - name: .concurrency .common !.kill_terminate
   - name: .integration !.audit
@@ -3016,7 +3010,8 @@ buildvariants:
   - name: noPassthroughWithMongod_gen
   - name: .logical_session_cache .one_sec
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
 
 - name: &enterprise-rhel80-sdam-replica-set-monitor-64-bit enterprise-rhel80-sdam-replica-set-monitor-64-bit
   display_name: "~ Enterprise RHEL 8.0 (with SdamReplicaSetMonitor)"
@@ -3049,14 +3044,15 @@ buildvariants:
     distros:
     - rhel80-build
   - name: .aggregation !.no_async
-  - name: .sharding .auth
+  - name: sharding_auth_gen
   - name: .sharding .causally_consistent !.wo_snapshot
   - name: .concurrency .common !.kill_terminate
   - name: .integration !.audit
   - name: .jscore .common
   - name: .logical_session_cache .one_sec
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
 
 - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit
   display_name: "~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"})"
@@ -3088,14 +3084,15 @@ buildvariants:
     distros:
     - rhel80-build
   - name: .aggregation !.no_async
-  - name: .sharding .auth
+  - name: sharding_auth_gen
   - name: .sharding .causally_consistent !.wo_snapshot
   - name: .concurrency .common !.kill_terminate
   - name: .integration !.audit
   - name: .jscore .common
   - name: .logical_session_cache .one_sec
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
 
 - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit
   display_name: "~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"})"
@@ -3132,14 +3129,15 @@ buildvariants:
     distros:
     - rhel80-build
   - name: .aggregation !.no_async
-  - name: .sharding .auth
+  - name: sharding_auth_gen
   - name: .sharding .causally_consistent !.wo_snapshot
   - name: .concurrency .common !.kill_terminate
   - name: .integration !.audit
   - name: .jscore .common
   - name: .logical_session_cache .one_sec
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
 
 - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit
   display_name: "~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"})"
@@ -3176,14 +3174,15 @@ buildvariants:
     distros:
     - rhel80-build
   - name: .aggregation !.no_async
-  - name: .sharding .auth
+  - name: sharding_auth_gen
   - name: .sharding .causally_consistent !.wo_snapshot
   - name: .concurrency .common !.kill_terminate
   - name: .integration !.audit
   - name: .jscore .common
   - name: .logical_session_cache .one_sec
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
 
 - name: &enterprise-rhel80-join-ingress-sessions-on-shutdown enterprise-rhel80-join-ingress-sessions-on-shutdown
   display_name: "~ Enterprise RHEL 8.0 (with {joinIngressSessionsOnShutdown: \"true\"})"
@@ -3214,7 +3213,7 @@ buildvariants:
     patch_only: true
   - name: .aggregation !.no_async
     patch_only: true
-  - name: .sharding .auth
+  - name: sharding_auth_gen
     patch_only: true
   - name: .sharding .causally_consistent !.wo_snapshot
     patch_only: true
@@ -3228,7 +3227,9 @@ buildvariants:
     patch_only: true
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
     patch_only: true
-  - name: .sharding .common !.csrs
+  - name: .sharding .common !.csrs !.encrypt
+    patch_only: true
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
     patch_only: true
 
 - name: &shared-scons-cache-pruning shared-scons-cache-pruning
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index 1f64b242f38..914b5c3299a 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -6345,33 +6345,36 @@ tasks:
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
-  name: sharding_max_mirroring_gen
-  tags: ["sharding", "common"]
+  name: sharding_csrs_continuous_config_stepdown_gen
+  tags: ["sharding", "common", "csrs", "non_live_record"]
   commands:
   - func: "generate resmoke tasks"
     vars:
+      suite: sharding_continuous_config_stepdown
       use_large_distro: "true"
 
+# This is a subset of sharding_max_mirroring_opportunistic_secondary_targeting_ese_gen and
+# sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen and should not be ran
+# in the same varient as them
 - <<: *gen_task_template
-  name: sharding_csrs_continuous_config_stepdown_gen
-  tags: ["sharding", "common", "csrs", "non_live_record"]
+  name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
+  tags: []
   commands:
   - func: "generate resmoke tasks"
     vars:
-      suite: sharding_continuous_config_stepdown
       use_large_distro: "true"
 
 - <<: *gen_task_template
-  name: sharding_ese_gen
-  tags: ["sharding", "encrypt", "no_debug_mode"]
+  name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gen
+  tags: ["sharding", "common", "encrypt", "no_debug_mode"]
   commands:
   - func: "generate resmoke tasks"
     vars:
       use_large_distro: "true"
 
 - <<: *gen_task_template
-  name: sharding_ese_gcm_gen
-  tags: ["sharding", "encrypt", "gcm", "no_debug_mode"]
+  name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gcm_gen
+  tags: ["sharding", "common", "encrypt", "gcm", "no_debug_mode"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6379,7 +6382,7 @@ tasks:
 
 - <<: *gen_task_template
   name: sharding_auth_gen
-  tags: ["sharding", "auth", "no_debug_mode"]
+  tags: []
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6387,7 +6390,7 @@ tasks:
 
 - <<: *gen_task_template
   name: sharding_auth_audit_gen
-  tags: ["auth", "audit", "non_live_record", "no_debug_mode"]
+  tags: ["sharding", "auth", "audit", "non_live_record", "no_debug_mode"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6413,14 +6416,6 @@ tasks:
       run_no_feature_flag_tests: "true"
 
 - <<: *gen_task_template
-  name: sharding_opportunistic_secondary_targeting_gen
-  tags: ["sharding", "common"]
-  commands:
-  - func: "generate resmoke tasks"
-    vars:
-      use_large_distro: "true"
-
-- <<: *gen_task_template
   name: analyze_shard_key_jscore_passthrough_gen
   tags: ["sharding"]
   commands:
diff --git a/etc/evergreen_yml_components/variants/atlas.yml b/etc/evergreen_yml_components/variants/atlas.yml
index 6b5bfa62e3d..b44a88475b3 100644
--- a/etc/evergreen_yml_components/variants/atlas.yml
+++ b/etc/evergreen_yml_components/variants/atlas.yml
@@ -64,7 +64,6 @@ buildvariants:
   - name: search_auth
   - name: search_ssl
   - name: sharding_auth_audit_gen
-  - name: sharding_auth_gen
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
diff --git a/etc/evergreen_yml_components/variants/in_memory.yml b/etc/evergreen_yml_components/variants/in_memory.yml
index 56ab083b1d4..f684607d259 100644
--- a/etc/evergreen_yml_components/variants/in_memory.yml
+++ b/etc/evergreen_yml_components/variants/in_memory.yml
@@ -69,7 +69,8 @@ buildvariants:
     distros:
     - rhel80-medium
   - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: .sharding .common !.multiversion !.csrs
+  - name: .sharding .common !.multiversion !.csrs !.encrypt
+  - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
   - name: .ssl
   - name: .updatefuzzer
 
@@ -125,7 +126,6 @@ buildvariants:
   - name: replica_sets_multi_stmt_txn_jscore_passthrough
   - name: sasl
   - name: .sharding .txns
-  - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
   - name: .ssl
   - name: .resharding_fuzzer
diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml
index 5855bb0691e..4eb6e5f51ce 100644
--- a/etc/evergreen_yml_components/variants/misc_release.yml
+++ b/etc/evergreen_yml_components/variants/misc_release.yml
@@ -35,6 +35,7 @@ buildvariants:
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -155,6 +156,7 @@ buildvariants:
     - amazon2-arm64-large
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -488,6 +490,7 @@ buildvariants:
     - amazon2022-arm64-large
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -661,6 +664,7 @@ buildvariants:
   - name: aggregation
   - name: aggregation_auth
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -736,7 +740,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
@@ -779,6 +783,7 @@ buildvariants:
   - name: aggregation
   - name: aggregation_auth
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -852,7 +857,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
@@ -892,6 +897,7 @@ buildvariants:
     - rhel70
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -993,6 +999,7 @@ buildvariants:
     - rhel80-build
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -1170,6 +1177,7 @@ buildvariants:
     - rhel82-arm64-large
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -1249,7 +1257,6 @@ buildvariants:
   - name: search_auth
   - name: search_ssl
   - name: sharding_auth_audit_gen
-  - name: sharding_auth_gen
   - name: .stitch
   - name: .crypt
     distros:
@@ -1288,6 +1295,7 @@ buildvariants:
     - rhel90-build
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -1369,7 +1377,6 @@ buildvariants:
   - name: search_auth
   - name: search_ssl
   - name: sharding_auth_audit_gen
-  - name: sharding_auth_gen
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
@@ -1411,6 +1418,7 @@ buildvariants:
     - rhel90-arm64-large
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -1539,6 +1547,7 @@ buildvariants:
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common !.large
@@ -1614,7 +1623,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: .stitch
   - name: .crypt
     distros:
@@ -1670,7 +1679,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
@@ -1712,6 +1721,7 @@ buildvariants:
   - name: .aggfuzzer .common !.multiversion
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -1769,6 +1779,7 @@ buildvariants:
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: .misc_js
   - name: .concurrency .common
   - name: concurrency_replication_causal_consistency_gen
@@ -1871,7 +1882,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: .watchdog
   - name: test_packages
     distros:
@@ -1921,6 +1932,7 @@ buildvariants:
   - name: aggregation
   - name: aggregation_wildcard_fuzzer_gen
   - name: .auth !.audit !.multiversion !.jscore
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -2015,6 +2027,7 @@ buildvariants:
   - name: .aggfuzzer .common !.multiversion
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: .misc_js
   - name: .concurrency .common
   - name: concurrency_replication_causal_consistency_gen
@@ -2070,6 +2083,7 @@ buildvariants:
   - name: .aggfuzzer .common !.multiversion
   - name: aggregation
   - name: .auth !.audit !.multiversion
+  - name: sharding_auth_gen
   - name: .misc_js
   - name: .concurrency .common
   - name: concurrency_replication_causal_consistency_gen
@@ -2151,7 +2165,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: test_packages
     distros:
     - ubuntu2004-package
@@ -2217,7 +2231,7 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: test_packages
     distros:
     - ubuntu2204-large
@@ -2265,6 +2279,7 @@ buildvariants:
   - name: aggregation
   - name: aggregation_wildcard_fuzzer_gen
   - name: .auth !.audit !.multiversion !.jscore
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common
@@ -2357,6 +2372,7 @@ buildvariants:
   - name: aggregation
   - name: aggregation_wildcard_fuzzer_gen
   - name: .auth !.audit !.multiversion !.jscore
+  - name: sharding_auth_gen
   - name: causally_consistent_jscore_txns_passthrough
   - name: .misc_js
   - name: .concurrency .common