SERVER-38816: Split long running tasks up dynamically

(cherry picked from commit e1482235115efd0072c0e773cbd8e774578b68db)

2 files changed, 289 insertions, 57 deletions

diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py
index 0108c889f4f..9ecd1e10f5d 100755
--- a/buildscripts/evergreen_generate_resmoke_tasks.py
+++ b/buildscripts/evergreen_generate_resmoke_tasks.py
@@ -198,7 +198,8 @@ def update_suite_config(suite_config, roots=None, excludes=None):
     if excludes:
         # This must be a misc file, if the exclude_files section exists, extend it, otherwise,
         # create it.
-        if "exclude_files" in suite_config["selector"]:
+        if "exclude_files" in suite_config["selector"] and \
+                suite_config["selector"]["exclude_files"]:
             suite_config["selector"]["exclude_files"] += excludes
         else:
             suite_config["selector"]["exclude_files"] = excludes
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index ab19e6d99f0..06e67e77b4a 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -4995,6 +4995,14 @@ tasks:
     vars:
       resmoke_args: --suites=auth --storageEngine=wiredTiger
 
+- name: auth_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: auth
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 4
+
 - <<: *task_template
   name: auth_audit
   commands:
@@ -5003,6 +5011,14 @@ tasks:
     vars:
       resmoke_args: --suites=auth_audit --storageEngine=wiredTiger
 
+- name: auth_audit_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: auth_audit
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 4
+
 - <<: *task_template
   name: change_streams
   commands:
@@ -5386,6 +5402,18 @@ tasks:
     vars:
       resmoke_args: --suites=replica_sets_jscore_passthrough --storageEngine=wiredTiger
 
+- name: replica_sets_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: replica_sets_jscore_passthrough
+      depends_on: jsCore
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: replica_sets_multi_stmt_txn_jscore_passthrough
   depends_on:
@@ -5500,6 +5528,15 @@ tasks:
     vars:
       resmoke_args: --suites=no_passthrough --storageEngine=wiredTiger
 
+- name: noPassthrough_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: noPassthrough
+      suite: no_passthrough
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 11
+
 - <<: *task_template
   name: noPassthroughWithMongod
   commands:
@@ -5508,6 +5545,15 @@ tasks:
     vars:
       resmoke_args: --suites=no_passthrough_with_mongod --storageEngine=wiredTiger
 
+- name: noPassthroughWithMongod_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: noPassthroughWithMongod
+      suite: no_passthrough_with_mongod
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 5
+
 - <<: *task_template
   name: bulk_gle_passthrough
   commands:
@@ -5525,6 +5571,15 @@ tasks:
       resmoke_args: --suites=slow1 --storageEngine=wiredTiger
       resmoke_jobs_max: 1
 
+- name: slow1_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: slow1
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 4
+      resmoke_jobs_max: 1
+
 - <<: *task_template
   name: serial_run
   commands:
@@ -5574,6 +5629,18 @@ tasks:
     vars:
       resmoke_args: --suites=sharding_jscore_passthrough --storageEngine=wiredTiger --shellReadMode=legacy --shellWriteMode=compatibility --excludeWithAnyTags=requires_find_command
 
+- name: sharding_jscore_passthrough_wire_ops_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: sharding_jscore_passthrough_wire_ops
+      suite: sharding_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger --shellReadMode=legacy --shellWriteMode=compatibility --excludeWithAnyTags=requires_find_command
+      fallback_num_sub_suites: 4
+
 - <<: *task_template
   name: parallel
   depends_on:
@@ -5686,6 +5753,15 @@ tasks:
       resmoke_args: --suites=concurrency_sharded_causal_consistency --storageEngine=wiredTiger
       resmoke_jobs_max: 1
 
+- name: concurrency_sharded_causal_consistency_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: concurrency_sharded_causal_consistency
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 3
+      resmoke_jobs_max: 1
+
 - <<: *task_template
   name: concurrency_sharded_causal_consistency_and_balancer
   commands:
@@ -5750,6 +5826,18 @@ tasks:
     vars:
       resmoke_args: --suites=read_concern_majority_passthrough --storageEngine=wiredTiger
 
+- name: read_concern_majority_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: read_concern_majority_passthrough
+      depends_on: jsCore
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 7
+
 - <<: *task_template
   name: write_concern_majority_passthrough
   depends_on:
@@ -5770,6 +5858,18 @@ tasks:
     vars:
       resmoke_args: --suites=secondary_reads_passthrough --storageEngine=wiredTiger
 
+- name: secondary_reads_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: secondary_reads_passthrough
+      depends_on: jsCore
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 11
+
 - <<: *task_template
   name: replica_sets
   commands:
@@ -5845,6 +5945,16 @@ tasks:
     vars:
       resmoke_args: --suites=sharding_continuous_config_stepdown --storageEngine=wiredTiger
 
+- name: sharding_csrs_continuous_config_stepdown_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: sharding_csrs_continuous_config_stepdown
+      suite: sharding_continuous_config_stepdown
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 22
+
 - <<: *task_template
   name: sharding_ese
   commands:
@@ -5956,6 +6066,14 @@ tasks:
     vars:
       resmoke_args: --suites=ssl --storageEngine=wiredTiger
 
+- name: ssl_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: ssl
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 5
+
 - <<: *task_template
   name: sslSpecial
   commands:
@@ -5964,6 +6082,15 @@ tasks:
     vars:
       resmoke_args: --suites=ssl_special --storageEngine=wiredTiger
 
+- name: sslSpecial_gen
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: sslSpecial
+      suite: ssl_special
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 3
+
 - <<: *task_template
   name: tool
   commands:
@@ -6016,6 +6143,17 @@ tasks:
     vars:
       resmoke_args: --suites=causally_consistent_jscore_passthrough --storageEngine=wiredTiger
 
+- name: causally_consistent_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: causally_consistent_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 6
+
 - <<: *task_template
   name: causally_consistent_jscore_passthrough_auth
   depends_on:
@@ -6026,6 +6164,17 @@ tasks:
     vars:
       resmoke_args: --suites=causally_consistent_jscore_passthrough_auth --storageEngine=wiredTiger
 
+- name: causally_consistent_jscore_passthrough_auth_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: causally_consistent_jscore_passthrough_auth
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 7
+
 - <<: *task_template
   name: sharded_causally_consistent_jscore_passthrough
   depends_on:
@@ -6036,6 +6185,17 @@ tasks:
     vars:
       resmoke_args: --suites=sharded_causally_consistent_jscore_passthrough --storageEngine=wiredTiger
 
+- name: sharded_causally_consistent_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: sharded_causally_consistent_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 6
+
 - <<: *task_template
   name: retryable_writes_jscore_passthrough
   depends_on:
@@ -6046,6 +6206,18 @@ tasks:
     vars:
       resmoke_args: --suites=retryable_writes_jscore_passthrough --storageEngine=wiredTiger
 
+- name: retryable_writes_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: retryable_writes_jscore_passthrough
+      depends_on: jsCore
+      use_large_distro: "true"
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 8
+
 - <<: *task_template
   name: logical_session_cache_replication_default_refresh_jscore_passthrough
   depends_on:
@@ -6056,6 +6228,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_replication_default_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_replication_default_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 7
+
 - <<: *task_template
   name: logical_session_cache_replication_100ms_refresh_jscore_passthrough
   depends_on:
@@ -6066,6 +6249,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_replication_100ms_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_replication_100ms_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 8
+
 - <<: *task_template
   name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
   depends_on:
@@ -6076,6 +6270,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_replication_1sec_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_replication_1sec_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 7
+
 - <<: *task_template
   name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
   depends_on:
@@ -6086,6 +6291,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_replication_10sec_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_replication_10sec_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_replication_10sec_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 7
+
 - <<: *task_template
   name: logical_session_cache_sharding_default_refresh_jscore_passthrough
   depends_on:
@@ -6116,6 +6332,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_sharding_1sec_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 3
+
 - <<: *task_template
   name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough
   depends_on:
@@ -6156,6 +6383,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_standalone_1sec_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 3
+
 - <<: *task_template
   name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough
   depends_on:
@@ -7208,6 +7446,7 @@ buildvariants:
     shared_scons_pruning: true
     tooltags: ""
     build_mongoreplay: true
+    target_resmoke_time: 15
   display_tasks:
   - *dbtest
   - *unittests
@@ -7220,10 +7459,10 @@ buildvariants:
   - name: aggregation_one_shard_sharded_collections
   - name: aggregation_read_concern_majority_passthrough
   - name: aggregation_sharded_collections_passthrough
-  - name: auth
+  - name: auth_gen
   - name: bulk_gle_passthrough
-  - name: causally_consistent_jscore_passthrough
-  - name: causally_consistent_jscore_passthrough_auth
+  - name: causally_consistent_jscore_passthrough_gen
+  - name: causally_consistent_jscore_passthrough_auth_gen
   - name: change_streams
   - name: change_streams_mongos_passthrough
   - name: change_streams_mongos_sessions_passthrough
@@ -7240,7 +7479,7 @@ buildvariants:
   - name: concurrency_replication_multi_stmt_txn
   - name: concurrency_sharded_replication
   - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency
+  - name: concurrency_sharded_causal_consistency_gen
   - name: concurrency_sharded_causal_consistency_and_balancer
   - name: concurrency_sharded_with_stepdowns
   - name: concurrency_sharded_with_stepdowns_and_balancer
@@ -7258,25 +7497,25 @@ buildvariants:
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_default_refresh_jscore_passthrough
+  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
   - name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
   - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough
   - name: logical_session_cache_sharding_default_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
   - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_default_refresh_jscore_passthrough
   - name: mongosTest
-  - name: noPassthrough
-  - name: noPassthroughWithMongod
+  - name: noPassthrough_gen
+  - name: noPassthroughWithMongod_gen
   - name: parallel
   - name: parallel_compatibility
   - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough
+  - name: read_concern_majority_passthrough_gen
   - name: read_only
   - name: read_only_sharded
   - name: replica_sets
@@ -7288,18 +7527,18 @@ buildvariants:
   - name: replica_sets_kill_primary_jscore_passthrough
   - name: replica_sets_terminate_primary_jscore_passthrough
   - name: replica_sets_kill_secondaries_jscore_passthrough
-  - name: retryable_writes_jscore_passthrough
+  - name: retryable_writes_jscore_passthrough_gen
   - name: retryable_writes_jscore_stepdown_passthrough
   - name: serial_run
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_passthrough
+  - name: sharded_causally_consistent_jscore_passthrough_gen
   - name: sharded_collections_jscore_passthrough
   - name: sharding_gen
   - name: sharding_auth_gen
   - name: sharding_jscore_passthrough
   - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops
-  - name: slow1
+  - name: sharding_jscore_passthrough_wire_ops_gen
+  - name: slow1_gen
   - name: tool
   - name: write_concern_majority_passthrough
 
@@ -8711,6 +8950,7 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: false
     jstestfuzz_num_generated_files: 35
+    target_resmoke_time: 20
     large_distro_name: windows-64-vs2017-compile
   display_tasks:
   - *dbtest
@@ -8725,7 +8965,7 @@ buildvariants:
     - windows-64-vs2015-large
   - name: burn_in_tests
   - name: audit
-  - name: auth_audit
+  - name: auth_audit_gen
   - name: benchmarks_orphaned
   - name: benchmarks_sharding
   - name: buildscripts_test
@@ -8756,8 +8996,8 @@ buildvariants:
   - name: sharding_auth_audit_gen
   - name: sharding_ese_gen
   - name: snmp
-  - name: ssl
-  - name: sslSpecial
+  - name: ssl_gen
+  - name: sslSpecial_gen
   - name: push
     distros:
     - rhel70-small
@@ -9726,7 +9966,7 @@ buildvariants:
     build_mongoreplay: true
     jstestfuzz_num_generated_files: 40
     jstestfuzz_concurrent_num_files: 10
-    target_resmoke_time: 20
+    target_resmoke_time: 10
     large_distro_name: rhel62-large
   display_tasks:
   - *dbtest
@@ -9757,8 +9997,8 @@ buildvariants:
   - name: aggregation_read_concern_majority_passthrough
   - name: aggregation_sharded_collections_passthrough
   - name: audit
-  - name: auth
-  - name: auth_audit
+  - name: auth_gen
+  - name: auth_audit_gen
   - name: benchmarks_orphaned
     distros:
     - centos6-perf
@@ -9767,9 +10007,9 @@ buildvariants:
     - centos6-perf
   - name: buildscripts_test
   - name: bulk_gle_passthrough
-  - name: causally_consistent_jscore_passthrough
-  - name: causally_consistent_jscore_passthrough_auth
-  - name: sharded_causally_consistent_jscore_passthrough
+  - name: causally_consistent_jscore_passthrough_gen
+  - name: causally_consistent_jscore_passthrough_auth_gen
+  - name: sharded_causally_consistent_jscore_passthrough_gen
   - name: change_streams
   - name: change_streams_mongos_passthrough
   - name: change_streams_mongos_sessions_passthrough
@@ -9791,7 +10031,7 @@ buildvariants:
   - name: concurrency_replication_multi_stmt_txn
   - name: concurrency_sharded_replication
   - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency
+  - name: concurrency_sharded_causal_consistency_gen
   - name: concurrency_sharded_causal_consistency_and_balancer
   - name: concurrency_sharded_with_stepdowns
   - name: concurrency_sharded_with_stepdowns_and_balancer
@@ -9835,32 +10075,30 @@ buildvariants:
   - name: jstestfuzz_sharded_causal_consistency_gen
   - name: jstestfuzz_sharded_continuous_stepdown_gen
   - name: jstestfuzz_sharded_session_gen
-  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_default_refresh_jscore_passthrough
+  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
   - name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
   - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough
   - name: logical_session_cache_sharding_default_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
   - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_default_refresh_jscore_passthrough
   - name: mongosTest
   - name: multiversion_auth
   - name: multiversion
   - name: multiversion_multistorage_engine
-  - name: noPassthroughWithMongod
-  - name: noPassthrough
+  - name: noPassthroughWithMongod_gen
+  - name: noPassthrough_gen
   - name: parallel
   - name: parallel_compatibility
   - name: read_concern_linearizable_passthrough
     distros:
     - rhel62-large
-  - name: read_concern_majority_passthrough
-    distros:
-    - rhel62-large
+  - name: read_concern_majority_passthrough_gen
   - name: read_only
   - name: read_only_sharded
   - name: replica_sets
@@ -9869,8 +10107,6 @@ buildvariants:
   - name: replica_sets_auth_gen
   - name: replica_sets_ese_gen
   - name: replica_sets_jscore_passthrough
-    distros:
-    - rhel62-large
   - name: replica_sets_initsync_jscore_passthrough
     distros:
     - rhel62-large
@@ -9889,9 +10125,7 @@ buildvariants:
   - name: replica_sets_kill_secondaries_jscore_passthrough
     distros:
     - rhel62-large
-  - name: retryable_writes_jscore_passthrough
-    distros:
-    - rhel62-large
+  - name: retryable_writes_jscore_passthrough_gen
   - name: retryable_writes_jscore_stepdown_passthrough
     distros:
     - rhel62-large
@@ -9907,26 +10141,22 @@ buildvariants:
   - name: sharding_gle_auth_basics_passthrough_write_cmd
   - name: sharding_jscore_passthrough
   - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops
+  - name: sharding_jscore_passthrough_wire_ops_gen
   - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_csrs_continuous_config_stepdown
-    distros:
-    - rhel62-large
+  - name: sharding_csrs_continuous_config_stepdown_gen
   - name: sharding_op_query_gen
-  - name: slow1
+  - name: slow1_gen
   - name: serial_run
   - name: snmp
-  - name: ssl
-  - name: sslSpecial
+  - name: ssl_gen
+  - name: sslSpecial_gen
   - name: tool
   - name: update_fuzzer_gen
   - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
     distros:
     - rhel62-large
-  - name: secondary_reads_passthrough
-    distros:
-    - rhel62-large
+  - name: secondary_reads_passthrough_gen
   - name: package
     distros:
     - ubuntu1604-packer
@@ -12513,6 +12743,7 @@ buildvariants:
     build_mongoreplay: true
     hang_analyzer_dump_core: false
     scons_cache_scope: shared
+    target_resmoke_time: 15
   display_tasks:
   - *dbtest
   - *unittests
@@ -12706,9 +12937,9 @@ buildvariants:
   - name: jsCore
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
   - name: watchdog_wiredtiger
 
 - name: ubuntu1604-debug-aubsan-async