SERVER-38818: Split tasks with dependencies

1 files changed, 30 insertions, 936 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index e61847622d2..afd3d2b3498 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -238,55 +238,6 @@ variables:
   - sharding_14
   - sharding_misc
 
-- &sharding_auth
-  name: sharding_auth
-  execution_tasks:
-  - sharding_auth_0
-  - sharding_auth_1
-  - sharding_auth_2
-  - sharding_auth_3
-  - sharding_auth_4
-  - sharding_auth_5
-  - sharding_auth_6
-  - sharding_auth_7
-  - sharding_auth_8
-  - sharding_auth_9
-  - sharding_auth_10
-  - sharding_auth_11
-  - sharding_auth_12
-  - sharding_auth_13
-  - sharding_auth_14
-  - sharding_auth_15
-  - sharding_auth_16
-  - sharding_auth_17
-  - sharding_auth_18
-  - sharding_auth_19
-  - sharding_auth_misc
-
-- &sharding_auth_audit
-  name: sharding_auth_audit
-  execution_tasks:
-  - sharding_auth_audit_0
-  - sharding_auth_audit_1
-  - sharding_auth_audit_2
-  - sharding_auth_audit_3
-  - sharding_auth_audit_4
-  - sharding_auth_audit_5
-  - sharding_auth_audit_6
-  - sharding_auth_audit_7
-  - sharding_auth_audit_8
-  - sharding_auth_audit_9
-  - sharding_auth_audit_10
-  - sharding_auth_audit_11
-  - sharding_auth_audit_12
-  - sharding_auth_audit_13
-  - sharding_auth_audit_14
-  - sharding_auth_audit_15
-  - sharding_auth_audit_16
-  - sharding_auth_audit_17
-  - sharding_auth_audit_18
-  - sharding_auth_audit_misc
-
 - &sharding_ese
   name: sharding_ese
   execution_tasks:
@@ -435,8 +386,6 @@ variables:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   - *unittests
   expansions: &enterprise-windows-64-2k8-nopush-expansions-template
@@ -457,6 +406,7 @@ variables:
     tooltags: "ssl sasl"
     build_mongoreplay: false
     jstestfuzz_num_generated_files: 35
+    large_distro_name: windows-64-vs2017-compile
   tasks:
   - name: compile_all_run_unittests_TG
     requires:
@@ -519,129 +469,8 @@ variables:
   - name: replica_sets_ese_6
   - name: replica_sets_ese_misc
   - name: sasl
-  - name: sharding_auth_0
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_1
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_2
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_3
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_4
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_5
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_6
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_7
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_8
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_9
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_10
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_11
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_12
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_13
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_14
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_15
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_16
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_17
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_18
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_19
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_misc
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_0
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_1
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_2
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_3
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_4
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_5
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_6
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_7
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_8
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_9
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_10
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_11
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_12
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_13
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_14
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_15
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_16
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_17
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_18
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_misc
-    distros:
-    - windows-64-vs2017-compile
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - windows-64-vs2017-compile
@@ -1577,6 +1406,8 @@ functions:
           extra_args="$extra_args --tagFile=etc/test_retrial.yml"
         fi
 
+        resmoke_cmd_args="${resmoke_args}"
+
         # The "resmoke_wrapper" expansion is used by the 'burn_in_tests' task to wrap the resmoke.py
         # invocation. It doesn't set any environment variables and should therefore come last in
         # this list of expansions.
@@ -1590,7 +1421,7 @@ functions:
             ${snmp_config_path}                         \
             ${resmoke_wrapper}                          \
             $python buildscripts/evergreen_run_tests.py \
-                ${resmoke_args}                         \
+                $resmoke_cmd_args                       \
                 $extra_args                             \
                 ${test_flags}                           \
                 --log=buildlogger                       \
@@ -6506,7 +6337,6 @@ tasks:
       resmoke_args: --suites=sasl --storageEngine=wiredTiger
 
 - name: sharding_gen
-  depends_on: []
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6963,173 +6793,14 @@ tasks:
     vars:
       resmoke_args: --suites=sharding_auth --storageEngine=wiredTiger
 
-- <<: *task_template
-  name: sharding_auth_0
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_0 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_1
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_1 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_2
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_2 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_3
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_3 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_4
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_4 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_5
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_5 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_6
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_6 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_7
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_7 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_8
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_8 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_9
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_9 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_10
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_10 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_11
+- name: sharding_auth_gen
   commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_11 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_12
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_12 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_13
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_13 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_14
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_14 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_15
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_15 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_16
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_16 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_17
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_17 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_18
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_18 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_19
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_19 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_misc
-  commands:
-  - func: "do setup"
-  - func: "run tests"
+  - func: "generate resmoke tasks"
     vars:
-      resmoke_args: --suites=sharding_auth_misc --storageEngine=wiredTiger
+      task: sharding_auth
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 20
 
 - <<: *task_template
   name: sharding_auth_audit
@@ -7141,206 +6812,17 @@ tasks:
     vars:
       resmoke_args: --suites=sharding_auth_audit --storageEngine=wiredTiger
 
-- <<: *task_template
-  name: sharding_auth_audit_0
-  depends_on: &sharding_auth_all
-  - name: sharding_auth_0
-  - name: sharding_auth_1
-  - name: sharding_auth_2
-  - name: sharding_auth_3
-  - name: sharding_auth_4
-  - name: sharding_auth_5
-  - name: sharding_auth_6
-  - name: sharding_auth_7
-  - name: sharding_auth_8
-  - name: sharding_auth_9
-  - name: sharding_auth_10
-  - name: sharding_auth_11
-  - name: sharding_auth_12
-  - name: sharding_auth_13
-  - name: sharding_auth_14
-  - name: sharding_auth_15
-  - name: sharding_auth_16
-  - name: sharding_auth_17
-  - name: sharding_auth_18
-  - name: sharding_auth_19
-  - name: sharding_auth_misc
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_0 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_1
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_1 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_2
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_2 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_3
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_3 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_4
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_4 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_5
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_5 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_6
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_6 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_7
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_7 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_8
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_8 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_9
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_9 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_10
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_10 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_11
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_11 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_12
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_12 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_13
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_13 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_14
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_14 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_15
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_15 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_16
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_16 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_17
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_17 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_18
-  depends_on: *sharding_auth_all
-  commands:
-  - func: "do setup"
-  - func: "run tests"
-    vars:
-      resmoke_args: --suites=sharding_auth_audit_18 --storageEngine=wiredTiger
-
-- <<: *task_template
-  name: sharding_auth_audit_misc
-  depends_on: *sharding_auth_all
+- name: sharding_auth_audit_gen
+  depends_on:
+  - name: sharding_auth_gen
   commands:
-  - func: "do setup"
-  - func: "run tests"
+  - func: "generate resmoke tasks"
     vars:
-      resmoke_args: --suites=sharding_auth_audit_misc --storageEngine=wiredTiger
+      task: sharding_auth_audit
+      depends_on: sharding_auth
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 20
 
 - <<: *task_template
   name: sharding_last_stable_mongos_and_mixed_shards
@@ -8732,7 +8214,6 @@ buildvariants:
   - *dbtest
   - *replica_sets_auth
   - *sharding
-  - *sharding_auth
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
@@ -8854,27 +8335,7 @@ buildvariants:
   - name: sharding_13
   - name: sharding_14
   - name: sharding_misc
-  - name: sharding_auth_0
-  - name: sharding_auth_1
-  - name: sharding_auth_2
-  - name: sharding_auth_3
-  - name: sharding_auth_4
-  - name: sharding_auth_5
-  - name: sharding_auth_6
-  - name: sharding_auth_7
-  - name: sharding_auth_8
-  - name: sharding_auth_9
-  - name: sharding_auth_10
-  - name: sharding_auth_11
-  - name: sharding_auth_12
-  - name: sharding_auth_13
-  - name: sharding_auth_14
-  - name: sharding_auth_15
-  - name: sharding_auth_16
-  - name: sharding_auth_17
-  - name: sharding_auth_18
-  - name: sharding_auth_19
-  - name: sharding_auth_misc
+  - name: sharding_auth_gen
   - name: sharding_jscore_passthrough
   - name: sharding_jscore_op_query_passthrough
   - name: sharding_jscore_passthrough_wire_ops
@@ -10623,12 +10084,11 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: false
     jstestfuzz_num_generated_files: 35
+    large_distro_name: windows-64-vs2017-compile
   display_tasks:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   tasks:
   - name: compile_TG
@@ -10693,129 +10153,8 @@ buildvariants:
   - name: sharded_collections_causally_consistent_jscore_txns_passthrough
   - name: sharded_jscore_txns
   - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_auth_0
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_1
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_2
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_3
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_4
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_5
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_6
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_7
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_8
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_9
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_10
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_11
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_12
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_13
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_14
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_15
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_16
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_17
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_18
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_19
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_misc
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_0
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_1
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_2
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_3
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_4
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_5
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_6
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_7
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_8
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_9
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_10
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_11
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_12
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_13
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_14
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_15
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_16
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_17
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_18
-    distros:
-    - windows-64-vs2017-compile
-  - name: sharding_auth_audit_misc
-    distros:
-    - windows-64-vs2017-compile
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - windows-64-vs2017-compile
@@ -11999,8 +11338,6 @@ buildvariants:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   - *sharding_last_stable_mongos_and_mixed_shards
   - *sharding_op_query
@@ -12246,129 +11583,8 @@ buildvariants:
     distros:
     - rhel62-large
   - name: sharding_gen
-  - name: sharding_auth_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_19
-    distros:
-    - rhel62-large
-  - name: sharding_auth_misc
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_misc
-    distros:
-    - rhel62-large
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - rhel62-large
@@ -12568,13 +11784,12 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
+    large_distro_name: rhel62-large
   display_tasks:
   - *dbtest
   - *replica_sets_auth
   - *replica_sets_ese
   - *sharding
-  - *sharding_auth
-  - *sharding_auth_audit
   - *sharding_ese
   - *sharding_last_stable_mongos_and_mixed_shards
   - *sharding_op_query
@@ -12804,129 +12019,8 @@ buildvariants:
   - name: sharding_misc
     distros:
     - rhel62-large
-  - name: sharding_auth_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_19
-    distros:
-    - rhel62-large
-  - name: sharding_auth_misc
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_0
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_1
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_2
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_3
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_4
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_5
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_6
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_7
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_8
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_9
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_10
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_11
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_12
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_13
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_14
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_15
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_16
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_17
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_18
-    distros:
-    - rhel62-large
-  - name: sharding_auth_audit_misc
-    distros:
-    - rhel62-large
+  - name: sharding_auth_gen
+  - name: sharding_auth_audit_gen
   - name: sharding_ese_0
     distros:
     - rhel62-large