SERVER-39414: Migrate task selection to task tags

author: David Bradford <david.bradford@mongodb.com> 2019-05-20 15:23:07 -0400
committer: David Bradford <david.bradford@mongodb.com> 2019-05-20 15:23:07 -0400
commit: 542d00d1a3a23d608f0a6e991684ea010cbc62ae (patch)
tree: 07799f3819afb0df9af0ba53fbafb4bb608bf93d /etc
parent: 793e28d328de4bfff72414becf6ccc7c291cecb3 (diff)
download: mongo-542d00d1a3a23d608f0a6e991684ea010cbc62ae.tar.gz
1 files changed, 951 insertions, 3593 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 09967343b2b..74a146de680 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -310,51 +310,24 @@ variables:
     distros:
     - windows-64-vs2017-compile
   - name: burn_in_tests_gen
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
+  - name: .aggfuzzer .common
   - name: audit
   - name: auth_audit_gen
-  - name: benchmarks_orphaned
-  - name: benchmarks_sharding
+  - name: .benchmarks
   - name: buildscripts_test
-  - name: ese
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .encrypt !.aggregation !.gcm
   - name: external_auth
     distros:
     - windows-64-2016
-  - name: fle
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_decimal
-  - name: jsCore_auth
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
+  - name: .jscore .common !.compat !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache
   - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
   - name: sasl
   - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
 
 - &stitch_support_task_group_template
   name: stitch_support_task_group_template
@@ -4739,6 +4712,7 @@ tasks:
 
 - <<: *benchmark_template
   name: benchmarks_orphaned
+  tags: ["benchmarks"]
   commands:
   - func: "do benchmark setup"
   - func: "run tests"
@@ -4749,6 +4723,7 @@ tasks:
 
 - <<: *benchmark_template
   name: benchmarks_sharding
+  tags: ["benchmarks"]
   commands:
   - func: "do benchmark setup"
   - func: "run tests"
@@ -4759,6 +4734,7 @@ tasks:
 
 - <<: *task_template
   name: generate_benchrun_embedded_files
+  tags: ["benchrun"]
   commands:
   - command: manifest.load
   - func: "git get project"
@@ -4798,6 +4774,7 @@ tasks:
 
 - <<: *task_template
   name: upload_benchrun_embedded_files
+  tags: ["benchrun"]
   depends_on:
   - generate_benchrun_embedded_files
   patchable: false
@@ -4817,6 +4794,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_aggregation
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4827,6 +4805,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_commands
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4837,6 +4816,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_insert
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4847,6 +4827,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_misc
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4857,6 +4838,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_mixed_and_multi
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4867,6 +4849,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_queries
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4877,6 +4860,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_remove
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4887,6 +4871,7 @@ tasks:
 
 - <<: *benchrun_embedded_template
   name: benchrun_embedded_update
+  tags: ["benchrun", "perf"]
   commands:
   - func: "do benchmark embedded setup"
   - func: "run tests"
@@ -4897,6 +4882,7 @@ tasks:
 
 - <<: *run_jepsen_template
   name: jepsen_register_findAndModify
+  tags: ["jepsen"]
   commands:
   - func: "do setup"
   - func: "do jepsen setup"
@@ -4909,6 +4895,7 @@ tasks:
 
 - <<: *run_jepsen_template
   name: jepsen_register_linearizableRead
+  tags: ["jepsen"]
   commands:
   - func: "do setup"
   - func: "do jepsen setup"
@@ -4921,6 +4908,7 @@ tasks:
 
 - <<: *run_jepsen_template
   name: jepsen_set_linearizableRead
+  tags: ["jepsen"]
   commands:
   - func: "do setup"
   - func: "do jepsen setup"
@@ -4933,6 +4921,7 @@ tasks:
 
 - <<: *run_jepsen_template
   name: jepsen_read-concern-majority
+  tags: ["jepsen"]
   commands:
   - func: "do setup"
   - func: "do jepsen setup"
@@ -4944,6 +4933,7 @@ tasks:
 
 - <<: *run_jepsen_template
   name: jepsen_read-concern-majority_w1
+  tags: ["jepsen"]
   commands:
   - func: "do setup"
   - func: "do jepsen setup"
@@ -4970,6 +4960,7 @@ tasks:
 ## Standalone generational fuzzer for aggregation pipelines ##
 - <<: *jstestfuzz_template
   name: aggregation_multiversion_fuzzer_gen
+  tags: ["aggfuzzer", "common"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -4984,6 +4975,7 @@ tasks:
 ## Standalone generational fuzzer for aggregation expressions ##
 - <<: *jstestfuzz_template
   name: aggregation_expression_multiversion_fuzzer_gen
+  tags: ["aggfuzzer"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -4998,6 +4990,7 @@ tasks:
 ## Standalone fuzzer for checking wildcard index correctness ##
 - <<: *jstestfuzz_template
   name: aggregation_wildcard_fuzzer_gen
+  tags: ["aggfuzzer", "common", "wildcard"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5012,6 +5005,7 @@ tasks:
 ## jstestfuzz standalone update generational fuzzer ##
 - <<: *jstestfuzz_template
   name: update_fuzzer_gen
+  tags: ["updatefuzzer"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5026,6 +5020,7 @@ tasks:
 ## jstestfuzz replication update generational fuzzer ##
 - <<: *jstestfuzz_template
   name: update_fuzzer_replication_gen
+  tags: ["updatefuzzer"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5040,6 +5035,7 @@ tasks:
 ## rollback generational fuzzer ##
 - <<: *jstestfuzz_template
   name: rollback_fuzzer_gen
+  tags: ["rollbackfuzzer"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5053,6 +5049,7 @@ tasks:
 ## rollback generational fuzzer with clean shutdowns ##
 - <<: *jstestfuzz_template
   name: rollback_fuzzer_clean_shutdowns_gen
+  tags: ["rollbackfuzzer"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5067,6 +5064,7 @@ tasks:
 ## rollback generational fuzzer with unclean shutdowns ##
 - <<: *jstestfuzz_template
   name: rollback_fuzzer_unclean_shutdowns_gen
+  tags: ["rollbackfuzzer"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5081,6 +5079,7 @@ tasks:
 ## jstestfuzz ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_gen
+  tags: ["jstestfuzz", "common"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5093,6 +5092,7 @@ tasks:
 ## jstestfuzz concurrent ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_gen
+  tags: ["jstestfuzz", "common"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5106,6 +5106,7 @@ tasks:
 ## jstestfuzz concurrent replica set ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_replication_gen
+  tags: ["jstestfuzz", "common", "repl"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5119,6 +5120,7 @@ tasks:
 ## jstestfuzz concurrent replica set with logical session ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_replication_session_gen
+  tags: ["jstestfuzz", "session"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5132,6 +5134,7 @@ tasks:
 ## jstestfuzz concurrent sharded cluster ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_sharded_gen
+  tags: ["jstestfuzz", "common"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5145,6 +5148,7 @@ tasks:
 ## jstestfuzz concurrent sharded cluster causal consistency ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_sharded_causal_consistency_gen
+  tags: ["jstestfuzz", "causal"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5158,6 +5162,7 @@ tasks:
 ## jstestfuzz concurrent sharded cluster continuous stepdown ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
+  tags: ["jstestfuzz"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5171,6 +5176,7 @@ tasks:
 ## jstestfuzz concurrent sharded cluster with logical session ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_concurrent_sharded_session_gen
+  tags: ["jstestfuzz", "session"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5184,6 +5190,7 @@ tasks:
 # jstestfuzz interrupt #
 - <<: *jstestfuzz_template
   name: jstestfuzz_interrupt_gen
+  tags: ["jstestfuzz", "interrupt"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5195,6 +5202,7 @@ tasks:
 # jstestfuzz interrupt #
 - <<: *jstestfuzz_template
   name: jstestfuzz_interrupt_replication_gen
+  tags: ["jstestfuzz", "interrupt"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5206,6 +5214,7 @@ tasks:
 ## jstestfuzz replica set ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_replication_gen
+  tags: ["jstestfuzz", "common", "repl"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5217,6 +5226,7 @@ tasks:
 ## jstestfuzz initial sync replica set ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_replication_initsync_gen
+  tags: ["jstestfuzz", "initsync"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5230,6 +5240,7 @@ tasks:
 ## jstestfuzz replica set with logical session ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_replication_session_gen
+  tags: ["jstestfuzz", "session"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5241,6 +5252,7 @@ tasks:
 ## jstestfuzz sharded cluster ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_sharded_gen
+  tags: ["jstestfuzz", "common"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5252,6 +5264,7 @@ tasks:
 ## jstestfuzz sharded cluster causal consistency ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_sharded_causal_consistency_gen
+  tags: ["jstestfuzz", "causal"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5263,6 +5276,7 @@ tasks:
 ## jstestfuzz sharded cluster continuous stepdown ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_sharded_continuous_stepdown_gen
+  tags: ["jstestfuzz"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5276,6 +5290,7 @@ tasks:
 ## jstestfuzz sharded cluster with logical session ##
 - <<: *jstestfuzz_template
   name: jstestfuzz_sharded_session_gen
+  tags: ["jstestfuzz", "session"]
   commands:
   - func: "generate fuzzer tasks"
     vars:
@@ -5288,6 +5303,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation
+  tags: ["aggregation", "common"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5296,6 +5312,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_ese
+  tags: ["aggregation", "encrypt"]
   depends_on:
   - name: jsCore
   commands:
@@ -5306,6 +5323,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_ese_gcm
+  tags: ["aggregation", "encrypt", "gcm"]
   depends_on:
   - name: jsCore
   commands:
@@ -5316,6 +5334,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_auth
+  tags: ["aggregation", "auth", "common"]
   depends_on:
   - name: aggregation
   commands:
@@ -5326,6 +5345,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_facet_unwind_passthrough
+  tags: ["aggregation", "unwind"]
   depends_on:
   - name: aggregation
   commands:
@@ -5336,6 +5356,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_mongos_passthrough
+  tags: ["aggregation", "no_async"]
   depends_on:
   - name: aggregation
   commands:
@@ -5346,6 +5367,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_one_shard_sharded_collections
+  tags: ["aggregation", "no_async"]
   depends_on:
   - name: aggregation
   commands:
@@ -5356,6 +5378,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_read_concern_majority_passthrough
+  tags: ["aggregation", "read_write_concern"]
   depends_on:
   - name: aggregation
   commands:
@@ -5366,6 +5389,7 @@ tasks:
 
 - <<: *task_template
   name: aggregation_sharded_collections_passthrough
+  tags: ["aggregation", "common"]
   depends_on:
   - name: aggregation
   commands:
@@ -5383,6 +5407,7 @@ tasks:
       resmoke_args: --suites=audit --storageEngine=wiredTiger
 
 - name: auth_gen
+  tags: ["auth"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -5390,6 +5415,7 @@ tasks:
       fallback_num_sub_suites: 4
 
 - name: auth_audit_gen
+  tags: ["auth", "audit"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -5398,6 +5424,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams
+  tags: ["change_streams"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5406,6 +5433,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_mongos_sessions_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams
   commands:
@@ -5416,6 +5444,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_mongos_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams
   commands:
@@ -5426,6 +5455,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_secondary_reads
+  tags: ["change_streams", "secondary_reads"]
   depends_on:
   - name: change_streams
   commands:
@@ -5436,6 +5466,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_sharded_collections_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams
   commands:
@@ -5446,6 +5477,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_db_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams
   commands:
@@ -5456,6 +5488,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_db_mongos_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams_mongos_passthrough
   commands:
@@ -5466,6 +5499,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_db_secondary_reads_passthrough
+  tags: ["change_streams", "secondary_reads"]
   depends_on:
   - name: change_streams_secondary_reads
   commands:
@@ -5476,6 +5510,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_db_sharded_collections_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams_sharded_collections_passthrough
   commands:
@@ -5486,6 +5521,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_cluster_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams
   commands:
@@ -5496,6 +5532,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_cluster_mongos_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams_mongos_passthrough
   commands:
@@ -5506,6 +5543,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_cluster_secondary_reads_passthrough
+  tags: ["change_streams", "secondary_reads"]
   depends_on:
   - name: change_streams_secondary_reads
   commands:
@@ -5516,6 +5554,7 @@ tasks:
 
 - <<: *task_template
   name: change_streams_whole_cluster_sharded_collections_passthrough
+  tags: ["change_streams"]
   depends_on:
   - name: change_streams_sharded_collections_passthrough
   commands:
@@ -5544,6 +5583,7 @@ tasks:
 
 - <<: *task_template
   name: ese
+  tags: ["encrypt"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5552,6 +5592,7 @@ tasks:
 
 - <<: *task_template
   name: failpoints
+  tags: ["misc_js"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5560,6 +5601,7 @@ tasks:
 
 - <<: *task_template
   name: failpoints_auth
+  tags: ["auth"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5568,6 +5610,7 @@ tasks:
 
 - <<: *task_template
   name: gle_auth
+  tags: ["auth", "gle"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5576,6 +5619,7 @@ tasks:
 
 - <<: *task_template
   name: gle_auth_write_cmd
+  tags: ["auth", "gle"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5584,6 +5628,7 @@ tasks:
 
 - <<: *task_template
   name: gle_auth_basics_passthrough
+  tags: ["auth", "gle"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5592,6 +5637,7 @@ tasks:
 
 - <<: *task_template
   name: gle_auth_basics_passthrough_write_cmd
+  tags: ["auth", "gle"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5600,6 +5646,7 @@ tasks:
 
 - <<: *task_template
   name: integration_tests_standalone
+  tags: ["integration", "standalone"]
   commands:
   - command: manifest.load
   - func: "git get project"
@@ -5618,6 +5665,7 @@ tasks:
 
 - <<: *task_template
   name: integration_tests_standalone_audit
+  tags: ["integration", "audit"]
   commands:
   - command: manifest.load
   - func: "git get project"
@@ -5636,6 +5684,7 @@ tasks:
 
 - <<: *task_template
   name: integration_tests_replset
+  tags: ["integration"]
   commands:
   - command: manifest.load
   - func: "git get project"
@@ -5654,6 +5703,7 @@ tasks:
 
 - <<: *task_template
   name: integration_tests_sharded
+  tags: ["integration", "sharded"]
   commands:
   - command: manifest.load
   - func: "git get project"
@@ -5680,6 +5730,7 @@ tasks:
 
 - <<: *task_template
   name: sharding_gle_auth_basics_passthrough
+  tags: ["auth", "gle"]
   depends_on:
   - name: gle_auth_basics_passthrough
   commands:
@@ -5690,6 +5741,7 @@ tasks:
 
 - <<: *task_template
   name: sharding_gle_auth_basics_passthrough_write_cmd
+  tags: ["auth", "gle"]
   depends_on:
   - name: gle_auth_basics_passthrough_write_cmd
   commands:
@@ -5700,6 +5752,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore
+  tags: ["jscore", "common"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5708,6 +5761,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_mobile
+  tags: ["jscore"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5716,6 +5770,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_ese
+  tags: ["jscore", "encrypt"]
   depends_on:
   - name: jsCore
   commands:
@@ -5726,6 +5781,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_ese_gcm
+  tags: ["jscore", "encrypt", "gcm"]
   depends_on:
   - name: jsCore
   commands:
@@ -5736,6 +5792,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_compatibility
+  tags: ["jscore", "common", "compat"]
   depends_on:
   - name: jsCore
   commands:
@@ -5746,6 +5803,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_auth
+  tags: ["jscore", "auth", "common"]
   depends_on:
   - name: jsCore
   commands:
@@ -5756,6 +5814,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_minimum_batch_size
+  tags: ["jscore"]
   depends_on:
   - name: jsCore
   commands:
@@ -5766,6 +5825,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_op_query
+  tags: ["jscore"]
   depends_on:
   - name: jsCore
   commands:
@@ -5776,6 +5836,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_txns
+  tags: ["jscore", "common", "txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5784,6 +5845,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_txns_multi_oplog_entries
+  tags: ["jscore", "txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5792,6 +5854,7 @@ tasks:
 
 - <<: *task_template
   name: sharded_jscore_txns
+  tags: ["sharding", "jscore", "txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5800,6 +5863,7 @@ tasks:
 
 - <<: *task_template
   name: sharded_jscore_txns_without_snapshot
+  tags: ["sharding", "wo_snapshot", "jscore"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5808,6 +5872,7 @@ tasks:
 
 - <<: *task_template
   name: sharded_jscore_txns_sharded_collections
+  tags: ["sharding", "jscore", "txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5816,6 +5881,7 @@ tasks:
 
 - <<: *task_template
   name: causally_consistent_jscore_txns_passthrough
+  tags: ["causally_consistent"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5823,6 +5889,7 @@ tasks:
       resmoke_args: --suites=causally_consistent_jscore_txns_passthrough --storageEngine=wiredTiger
 
 - name: sharded_causally_consistent_jscore_txns_passthrough_gen
+  tags: ["sharding", "jscore", "causally_consistent", "txns"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -5830,6 +5897,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - name: sharded_causally_consistent_jscore_txns_passthrough_without_snapshot_gen
+  tags: ["sharding", "wo_snapshot", "causally_consistent", "jscore"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -5839,6 +5907,7 @@ tasks:
 
 - <<: *task_template
   name: sharded_collections_causally_consistent_jscore_txns_passthrough
+  tags: ["sharding", "jscore", "causally_consistent", "txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5847,6 +5916,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_jscore_passthrough
+  tags: ["replica_sets", "common", "san", "large"]
   depends_on:
   - name: jsCore
   commands:
@@ -5868,6 +5938,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_multi_oplog_txns_jscore_passthrough
+  tags: ["replica_sets", "multi_oplog", "large", "non_maj_read", "san"]
   depends_on:
   - name: jsCore
   commands:
@@ -5878,6 +5949,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_multi_stmt_txn_jscore_passthrough
+  tags: ["replica_sets", "large"]
   depends_on:
   - name: jsCore
   commands:
@@ -5887,6 +5959,7 @@ tasks:
       resmoke_args: --suites=replica_sets_multi_stmt_txn_jscore_passthrough --storageEngine=wiredTiger
 
 - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
+  tags: ["replica_sets", "non_maj_read"]
   depends_on:
   - name: jsCore
   commands:
@@ -5899,6 +5972,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
+  tags: ["replica_sets", "non_maj_read"]
   depends_on:
   - name: jsCore
   commands:
@@ -5909,6 +5983,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
+  tags: ["replica_sets", "non_maj_read"]
   depends_on:
   - name: jsCore
   commands:
@@ -5919,6 +5994,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_initsync_jscore_passthrough
+  tags: ["replica_sets", "san", "large"]
   depends_on:
   - name: jsCore
   commands:
@@ -5929,6 +6005,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_initsync_static_jscore_passthrough
+  tags: ["replica_sets", "san", "large"]
   depends_on:
   - name: jsCore
   commands:
@@ -5939,6 +6016,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_kill_primary_jscore_passthrough
+  tags: ["replica_sets", "large", "non_maj_read"]
   depends_on:
   - name: jsCore
   commands:
@@ -5949,6 +6027,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_terminate_primary_jscore_passthrough
+  tags: ["replica_sets", "large", "non_maj_read"]
   depends_on:
   - name: jsCore
   commands:
@@ -5959,6 +6038,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets_kill_secondaries_jscore_passthrough
+  tags: ["replica_sets", "san", "large"]
   depends_on:
   - name: jsCore
   commands:
@@ -5969,6 +6049,7 @@ tasks:
 
 - <<: *task_template
   name: mongosTest
+  tags: ["misc_js", "non_mobile", "non_read_maj"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -5977,6 +6058,7 @@ tasks:
 
 - <<: *task_template
   name: multiversion_auth
+  tags: ["auth", "multiversion"]
   commands:
   - func: "do setup"
   - func: "do multiversion setup"
@@ -5996,6 +6078,7 @@ tasks:
       resmoke_args: --suites=multiversion --storageEngine=wiredTiger
 
 - name: noPassthrough_gen
+  tags: ["misc_js"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6004,6 +6087,7 @@ tasks:
       fallback_num_sub_suites: 11
 
 - name: noPassthroughWithMongod_gen
+  tags: ["misc_js"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6013,6 +6097,7 @@ tasks:
 
 - <<: *task_template
   name: bulk_gle_passthrough
+  tags: ["auth", "gle"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6020,6 +6105,7 @@ tasks:
       resmoke_args: --suites=bulk_gle_passthrough --storageEngine=wiredTiger
 
 - name: slow1_gen
+  tags: ["misc_js", "non_win_dbg", "non_mobile"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6029,6 +6115,7 @@ tasks:
 
 - <<: *task_template
   name: serial_run
+  tags: ["misc_js", "non_win_dbg"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6038,6 +6125,7 @@ tasks:
 
 - <<: *task_template
   name: sharded_collections_jscore_passthrough
+  tags: ["sharding", "jscore"]
   depends_on:
   - name: jsCore
   commands:
@@ -6048,6 +6136,7 @@ tasks:
 
 - <<: *task_template
   name: sharding_jscore_passthrough
+  tags: ["sharding", "jscore", "common"]
   depends_on:
   - name: jsCore
   commands:
@@ -6058,6 +6147,7 @@ tasks:
 
 - <<: *task_template
   name: sharding_jscore_op_query_passthrough
+  tags: ["sharding", "jscore"]
   depends_on:
   - name: jsCore
   commands:
@@ -6067,6 +6157,7 @@ tasks:
       resmoke_args: --suites=sharding_jscore_op_query_passthrough --storageEngine=wiredTiger
 
 - name: sharding_jscore_passthrough_wire_ops_gen
+  tags: ["sharding", "jscore"]
   depends_on:
   - name: jsCore
   commands:
@@ -6079,6 +6170,7 @@ tasks:
 
 - <<: *task_template
   name: sharded_multi_stmt_txn_jscore_passthrough
+  tags: ["sharding", "jscore", "multi_stmt"]
   depends_on:
   - name: jsCore
   commands:
@@ -6088,6 +6180,7 @@ tasks:
       resmoke_args: --suites=sharded_multi_stmt_txn_jscore_passthrough --storageEngine=wiredTiger
 
 - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
+  tags: ["multi_shard", "multi_stmt", "common"]
   depends_on:
   - name: jsCore
   commands:
@@ -6100,6 +6193,7 @@ tasks:
       resmoke_jobs_max: 0  # No cap on number of jobs.
 
 - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
+  tags: ["multi_shard", "common"]
   depends_on:
   - name: jsCore
   commands:
@@ -6110,6 +6204,7 @@ tasks:
       fallback_num_sub_suites: 4
 
 - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
+  tags: ["multi_stmt"]
   depends_on:
   - name: jsCore
   commands:
@@ -6121,6 +6216,7 @@ tasks:
       fallback_num_sub_suites: 19
 
 - name: multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough_gen
+  tags: ["multi_shard"]
   depends_on:
   - name: jsCore
   commands:
@@ -6132,6 +6228,7 @@ tasks:
       fallback_num_sub_suites: 19
 
 - name: multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough_gen
+  tags: ["multi_shard"]
   depends_on:
   - name: jsCore
   commands:
@@ -6143,6 +6240,7 @@ tasks:
       fallback_num_sub_suites: 19
 
 - name: parallel_gen
+  tags: ["misc_js", "non_mobile"]
   depends_on:
   - name: jsCore
   commands:
@@ -6155,6 +6253,7 @@ tasks:
 
 - <<: *task_template
   name: parallel_compatibility
+  tags: ["misc_js", "non_mobile"]
   depends_on:
   - name: jsCore_compatibility
   commands:
@@ -6166,6 +6265,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency
+  tags: ["concurrency", "common"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6175,6 +6275,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_replication
+  tags: ["concurrency", "common", "repl"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6184,6 +6285,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_replication_causal_consistency
+  tags: ["concurrency", "repl", "large"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6193,6 +6295,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_replication_multi_stmt_txn
+  tags: ["concurrency", "common", "repl", "txn"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6200,8 +6303,10 @@ tasks:
       resmoke_args: --suites=concurrency_replication_multi_stmt_txn --storageEngine=wiredTiger
       resmoke_jobs_max: 1
 
+  # TODO: SERVER-35964 revert the addition of UBSAN concurrency_replication suites.
 - <<: *task_template
   name: concurrency_replication_ubsan
+  tags: ["concurrency", "ubsan"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6211,6 +6316,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_replication_causal_consistency_ubsan
+  tags: ["concurrency", "ubsan"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6220,6 +6326,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_replication_multi_stmt_txn_ubsan
+  tags: ["concurrency", "ubsan"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6229,6 +6336,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_replication
+  tags: ["concurrency", "common", "read_concern_maj"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6238,6 +6346,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_replication_with_balancer
+  tags: ["concurrency", "common", "read_concern_maj"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6247,6 +6356,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_replication_no_txns
+  tags: ["concurrency", "no_txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6256,6 +6366,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_replication_no_txns_with_balancer
+  tags: ["concurrency", "no_txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6264,6 +6375,7 @@ tasks:
       resmoke_jobs_max: 1
 
 - name: concurrency_sharded_causal_consistency_gen
+  tags: ["concurrency"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6274,6 +6386,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_causal_consistency_and_balancer
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6283,6 +6396,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_with_stepdowns
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6292,6 +6406,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_with_stepdowns_and_balancer
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6301,6 +6416,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_multi_stmt_txn
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6310,6 +6426,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_multi_stmt_txn_with_balancer
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6319,6 +6436,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_local_read_write_multi_stmt_txn
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6328,6 +6446,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
+  tags: ["concurrency"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6337,6 +6456,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_sharded_multi_stmt_txn_with_stepdowns
+  tags: ["concurrency", "stepdowns"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6346,6 +6466,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_simultaneous
+  tags: ["concurrency", "common"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6355,6 +6476,7 @@ tasks:
 
 - <<: *task_template
   name: concurrency_simultaneous_replication
+  tags: ["concurrency", "common"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6364,6 +6486,7 @@ tasks:
 
 - <<: *task_template
   name: read_concern_linearizable_passthrough
+  tags: ["read_write_concern", "linearize", "large"]
   depends_on:
   - name: jsCore
   commands:
@@ -6373,6 +6496,7 @@ tasks:
       resmoke_args: --suites=read_concern_linearizable_passthrough --storageEngine=wiredTiger
 
 - name: read_concern_majority_passthrough_gen
+  tags: ["read_write_concern"]
   depends_on:
   - name: jsCore
   commands:
@@ -6385,6 +6509,7 @@ tasks:
 
 - <<: *task_template
   name: write_concern_majority_passthrough
+  tags: ["read_write_concern", "large", "write"]
   depends_on:
   - name: jsCore
   commands:
@@ -6406,6 +6531,7 @@ tasks:
 
 - <<: *task_template
   name: replica_sets
+  tags: ["replica_sets", "san", "large"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6413,6 +6539,7 @@ tasks:
       resmoke_args: --suites=replica_sets --storageEngine=wiredTiger
 
 - name: replica_sets_ese_gen
+  tags: ["replica_sets", "encrypt", "san"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6421,6 +6548,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: replica_sets_ese_gcm_gen
+  tags: ["replica_sets", "encrypt", "san", "gcm"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6429,6 +6557,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: replica_sets_auth_gen
+  tags: ["replica_sets", "common", "san", "auth"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6437,6 +6566,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: replica_sets_multi_oplog_txns_gen
+  tags: ["replica_sets", "multi_oplog", "san"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6452,6 +6582,7 @@ tasks:
       resmoke_args: --suites=sasl --storageEngine=wiredTiger
 
 - name: sharding_gen
+  tags: ["sharding", "common"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6460,6 +6591,7 @@ tasks:
       fallback_num_sub_suites: 15
 
 - name: sharding_csrs_continuous_config_stepdown_gen
+  tags: ["sharding", "common", "csrs"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6469,6 +6601,7 @@ tasks:
       fallback_num_sub_suites: 22
 
 - name: sharding_ese_gen
+  tags: ["sharding", "encrypt"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6477,6 +6610,7 @@ tasks:
       fallback_num_sub_suites: 21
 
 - name: sharding_ese_gcm_gen
+  tags: ["sharding", "encrypt", "gcm"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6485,6 +6619,7 @@ tasks:
       fallback_num_sub_suites: 21
 
 - name: sharding_op_query_gen
+  tags: ["sharding", "common", "op_query"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6494,6 +6629,7 @@ tasks:
       fallback_num_sub_suites: 12
 
 - name: sharding_auth_gen
+  tags: ["sharding", "auth"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6502,6 +6638,7 @@ tasks:
       fallback_num_sub_suites: 20
 
 - name: sharding_auth_audit_gen
+  tags: ["auth", "audit"]
   depends_on:
   - name: sharding_auth_gen
   commands:
@@ -6513,6 +6650,7 @@ tasks:
       fallback_num_sub_suites: 20
 
 - name: sharding_last_stable_mongos_and_mixed_shards_gen
+  tags: ["sharding", "common", "mixed_version"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6532,6 +6670,7 @@ tasks:
       resmoke_args: --suites=snmp --storageEngine=wiredTiger
 
 - name: ssl_gen
+  tags: ["encrypt", "ssl"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6539,6 +6678,7 @@ tasks:
       fallback_num_sub_suites: 5
 
 - name: sslSpecial_gen
+  tags: ["encrypt", "ssl"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -6548,6 +6688,7 @@ tasks:
 
 - <<: *task_template
   name: tool
+  tags: ["misc_js", "non_mobile", "tool"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6556,6 +6697,7 @@ tasks:
 
 - <<: *task_template
   name: jsCore_decimal
+  tags: ["jscore", "common", "decimal"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6564,6 +6706,7 @@ tasks:
 
 - <<: *task_template
   name: read_only
+  tags: ["read_only"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6572,6 +6715,7 @@ tasks:
 
 - <<: *task_template
   name: read_only_sharded
+  tags: ["read_only"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6589,6 +6733,7 @@ tasks:
       resmoke_args: --suites=session_jscore_passthrough --storageEngine=wiredTiger
 
 - name: causally_consistent_jscore_passthrough_gen
+  tags: ["causally_consistent"]
   depends_on:
   - name: jsCore
   commands:
@@ -6599,6 +6744,7 @@ tasks:
       fallback_num_sub_suites: 6
 
 - name: causally_consistent_jscore_passthrough_auth_gen
+  tags: ["causally_consistent"]
   depends_on:
   - name: jsCore
   commands:
@@ -6609,6 +6755,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: sharded_causally_consistent_jscore_passthrough_gen
+  tags: ["causally_consistent"]
   depends_on:
   - name: jsCore
   commands:
@@ -6619,6 +6766,7 @@ tasks:
       fallback_num_sub_suites: 6
 
 - name: retryable_writes_jscore_passthrough_gen
+  tags: ["retry"]
   depends_on:
   - name: jsCore
   commands:
@@ -6630,6 +6778,7 @@ tasks:
       fallback_num_sub_suites: 8
 
 - name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache", "repl"]
   depends_on:
   - name: jsCore
   commands:
@@ -6640,6 +6789,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache", "repl"]
   depends_on:
   - name: jsCore
   commands:
@@ -6650,6 +6800,7 @@ tasks:
       fallback_num_sub_suites: 8
 
 - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache", "one_sec", "repl"]
   depends_on:
   - name: jsCore
   commands:
@@ -6660,6 +6811,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache", "repl"]
   depends_on:
   - name: jsCore
   commands:
@@ -6670,6 +6822,7 @@ tasks:
       fallback_num_sub_suites: 7
 
 - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache"]
   depends_on:
   - name: jsCore
   commands:
@@ -6680,6 +6833,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache"]
   depends_on:
   - name: jsCore
   commands:
@@ -6690,6 +6844,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache", "one_sec"]
   depends_on:
   - name: jsCore
   commands:
@@ -6700,6 +6855,7 @@ tasks:
       fallback_num_sub_suites: 3
 
 - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache"]
   depends_on:
   - name: jsCore
   commands:
@@ -6710,6 +6866,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache"]
   depends_on:
   - name: jsCore
   commands:
@@ -6720,6 +6877,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache"]
   depends_on:
   - name: jsCore
   commands:
@@ -6730,6 +6888,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache", "one_sec"]
   depends_on:
   - name: jsCore
   commands:
@@ -6740,6 +6899,7 @@ tasks:
       fallback_num_sub_suites: 3
 
 - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
+  tags: ["logical_session_cache"]
   depends_on:
   - name: jsCore
   commands:
@@ -6751,6 +6911,7 @@ tasks:
 
 - <<: *task_template
   name: retryable_writes_jscore_stepdown_passthrough
+  tags: ["retry"]
   depends_on:
   - name: jsCore
   commands:
@@ -6761,6 +6922,7 @@ tasks:
 
 - <<: *task_template
   name: watchdog_wiredtiger
+  tags: ["watchdog"]
   commands:
   - func: "do setup"
   - func: "do watchdog setup"
@@ -6772,6 +6934,7 @@ tasks:
 # This is a separate task because it is only supported on Ubuntu 16.04+ which are not inmemory builders
 - <<: *task_template
   name: watchdog_inmemory
+  tags: ["watchdog"]
   commands:
   - func: "do setup"
   - func: "do watchdog setup"
@@ -6791,6 +6954,7 @@ tasks:
 
 - <<: *task_template
   name: fle
+  tags: ["encrypt"]
   commands:
   - func: "do setup"
   - func: "run tests"
@@ -6808,6 +6972,7 @@ tasks:
       resmoke_jobs_max: 1
 
 - name: powercycle
+  tags: ["powercycle"]
   exec_timeout_secs: 7200 # 2 hour timeout for the task overall
   depends_on:
   - name: compile
@@ -6828,6 +6993,7 @@ tasks:
       mongod_extra_options: --mongodOptions=\"--setParameter enableTestCommands=1 --setParameter logComponentVerbosity='{storage:{recovery:2}}' --storageEngine wiredTiger\"
 
 - name: powercycle_kill_mongod
+  tags: ["powercycle"]
   exec_timeout_secs: 7200 # 2 hour timeout for the task overall
   depends_on:
   - name: compile
@@ -6849,6 +7015,7 @@ tasks:
       mongod_extra_options: --mongodOptions=\"--setParameter enableTestCommands=1 --setParameter logComponentVerbosity='{storage:{recovery:2}}' --storageEngine wiredTiger\"
 
 - name: powercycle_fcv4.0
+  tags: ["powercycle"]
   exec_timeout_secs: 7200 # 2 hour timeout for the task overall
   depends_on:
   - name: compile
@@ -6871,6 +7038,7 @@ tasks:
       mongod_extra_options: --mongodOptions=\"--setParameter enableTestCommands=1  --setParameter logComponentVerbosity='{storage:{recovery:2}}' --storageEngine wiredTiger\"
 
 - name: powercycle_replication
+  tags: ["powercycle"]
   exec_timeout_secs: 7200 # 2 hour timeout for the task overall
   depends_on:
   - name: compile
@@ -6911,6 +7079,7 @@ tasks:
       mongod_extra_options: --replSet=powercycle --mongodOptions=\"--setParameter enableTestCommands=1 --setParameter logComponentVerbosity='{storage:{recovery:2}}' --oplogSize 20 --storageEngine wiredTiger\"
 
 - name: powercycle_syncdelay
+  tags: ["powercycle"]
   exec_timeout_secs: 7200 # 2 hour timeout for the task overall
   depends_on:
   - name: compile
@@ -7009,6 +7178,7 @@ tasks:
     - func: "run kitchen"
 
 - name: publish_packages
+  tags: ["publish"]
   # This should prevent this task from running in patch builds, where we
   # don't want to publish packages.
   patchable: false
@@ -7042,6 +7212,7 @@ tasks:
           ./curator repo --config ./etc/repo_config.yaml --distro ${packager_distro} --edition ${repo_edition} --version ${version} --arch ${packager_arch} --packages repo
 
 - name: push
+  tags: ["publish"]
   patchable: false
   depends_on:
   - name: jsCore
@@ -7664,10 +7835,12 @@ task_groups:
   - "embedded_sdk_tests_s3_put_latest"
 - <<: *stitch_support_task_group_template
   name: stitch_support_lib_build_and_archive
+  tags: ["stitch"]
   tasks:
     - "stitch_support_create_lib"
 - <<: *stitch_support_task_group_template
   name: stitch_support_lib_build_and_test
+  tags: ["stitch"]
   tasks:
     - "stitch_support_install_tests"
     - "stitch_support_run_tests"
@@ -7724,50 +7897,19 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
-  - name: integration_tests_standalone
-    distros:
-    - rhel62-large
-  - name: integration_tests_replset
-    distros:
-    - rhel62-large
-  - name: integration_tests_sharded
+  - name: .integration !.audit
     distros:
     - rhel62-large
   - name: jsCore
   - name: jsCore_txns
-  - 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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
+  - name: .logical_session_cache
   - name: parallel_gen
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .concurrency .common
     distros:
-    - rhel62-large
+      - rhel62-large
   - name: concurrency_replication_causal_consistency
     distros:
-    - rhel62-large
-  - name: concurrency_replication_multi_stmt_txn
-    distros:
-    - rhel62-large
-  - name: concurrency_sharded_replication
-    distros:
-    - rhel62-large
-  - name: concurrency_sharded_replication_with_balancer
-    distros:
-    - rhel62-large
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-    distros:
-    - rhel62-large
+      - rhel62-large
 
 - &linux-64-debug-template
   name: linux-64-debug
@@ -7791,119 +7933,30 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: aggregation
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
-  - name: auth_gen
+  - name: .aggregation !.encrypt
+  - name: .auth !.audit !.gle !.multiversion
   - name: bulk_gle_passthrough
-  - 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
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
+  - name: .causally_consistent !.wo_snapshot
+  - name: .change_streams !.secondary_reads
+  - name: .misc_js
+  - name: .concurrency !.ubsan !.no_txns
   - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: integration_tests_replset
-  - name: integration_tests_sharded
-  - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .integration !.audit
+  - name: .jscore .common
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - 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_sharding_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
-  - name: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough_gen
+  - name: .logical_session_cache
+  - name: .multi_shard
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_initsync_jscore_passthrough
-  - name: replica_sets_initsync_static_jscore_passthrough
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-  - 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_gen
-  - name: retryable_writes_jscore_stepdown_passthrough
-  - name: serial_run
+  - name: .read_write_concern
+  - name: .replica_sets !.encrypt
+  - name: .retry
+  - name: .read_only
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_passthrough_gen
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
   - name: sharded_multi_stmt_txn_jscore_passthrough
+  - name: .sharding .jscore !.wo_snapshot
   - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: slow1_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
+  - name: .stitch
 
 - <<: *linux-64-debug-template
   name: linux-64-debug-wtdevelop
@@ -7944,35 +7997,20 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
+  - name: .aggfuzzer .common
   - name: aggregation
   - name: aggregation_auth
   - name: auth_gen
   - name: bulk_gle_passthrough
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
   - name: concurrency
   - name: concurrency_simultaneous
   - name: disk_wiredtiger
-  - name: failpoints
   - name: failpoints_auth
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: serial_run
+  - name: .jscore .common !.decimal
+  - name: .jstestfuzz .common !.repl
   - name: sharding_jscore_passthrough
-  - name: slow1_gen
-  - name: tool
 
 - name: linux-64-required-duroff
   display_name: "! Linux (No Journal)"
@@ -8042,75 +8080,32 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - ubuntu1804-build
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
+  - name: .auth !.audit !.multiversion
+  - name: .misc_js
+  - name: .concurrency .common
+  - name: concurrency_replication_causal_consistency
+    distros:
+      - ubuntu1804-build
   - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-    distros:
-    - ubuntu1804-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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: replica_sets
-  - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
+  - name: .sharding .txns
   - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
   - name: sharding_jscore_passthrough
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
   - name: watchdog_wiredtiger
+  - name: .ssl
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: enterprise-ubuntu1804-64
   display_name: Enterprise Ubuntu 18.04
@@ -8142,38 +8137,24 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - ubuntu1804-build
+  - name: .aggfuzzer .common
   - name: audit
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.aggregation !.replica_sets !.sharding !.jscore
+  - name: .jscore .common !.compat !.decimal !.sharding
+  - name: jsCore_auth
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: sharding_auth_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: watchdog_inmemory
-  - name: watchdog_wiredtiger
+  - name: .watchdog
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: ubuntu1604
   display_name: SSL Ubuntu 16.04
@@ -8204,92 +8185,35 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - ubuntu1604-build
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
+  - name: .auth !.audit !.multiversion
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
+  - name: concurrency_replication_causal_consistency
+    distros:
+      - ubuntu1604-build
   - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jepsen_register_findAndModify
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_register_linearizableRead
+  - name: .jepsen
     distros:
     - ubuntu1604-build
-  - name: jepsen_set_linearizableRead
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_read-concern-majority
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_read-concern-majority_w1
-    distros:
-    - ubuntu1604-build
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-    distros:
-    - ubuntu1604-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
   - name: watchdog_wiredtiger
+  - name: .replica_sets .common
+  - name: .sharding .common !.op_query !.csrs
+  - name: .sharding .txns
+  - name: .stitch
+  - name: .ssl
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: enterprise-ubuntu1604-arm64
   display_name: Enterprise Ubuntu 16.04 arm64
@@ -8320,69 +8244,25 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion !.jscore
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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: fle
+  - name: .jscore .common !.auth
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
+  - name: .sharding .txns
   - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
   - name: sharding_jscore_passthrough
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: publish_packages
-    distros:
-    - ubuntu1604-test
-  - name: push
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
     distros:
     - ubuntu1604-test
 
@@ -8416,67 +8296,24 @@ buildvariants:
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
   - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.audit !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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: fle
+  - name: .jscore .common !.auth
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
+  - name: .sharding .txns
   - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
   - name: sharding_jscore_passthrough
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: publish_packages
-    distros:
-    - ubuntu1804-test
-  - name: push
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
     distros:
     - ubuntu1804-test
 
@@ -8510,10 +8347,7 @@ buildvariants:
   - name: free_monitoring
   - name: jsCore
   - name: replica_sets_jscore_passthrough
-  - name: publish_packages
-    distros:
-    - ubuntu1804-test
-  - name: push
+  - name: .publish
     distros:
     - ubuntu1804-test
 
@@ -8550,73 +8384,28 @@ buildvariants:
     distros:
     - ubuntu1804-power8-build
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
   - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: noPassthrough_gen
-    distros:
-    - ubuntu1804-power8-build
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.audit !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  #- name: concurrency_sharded_replication_local_read_write_multi_stmt_txn # Removed until SERVER-38499 is resolved.
-  #- name: concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer # Removed until SERVER-38499 is resolved.
-  #- name: concurrency_sharded_replication_multi_stmt_txn # Removed until SERVER-38499 is resolved.
-  #- name: concurrency_sharded_replication_multi_stmt_txn_with_balancer # Removed until SERVER-38499 is resolved.
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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: concurrency_sharded_replication_local_read_write_multi_stmt_txn # Removed until SERVER-38499 is resolved.
+    #- name: concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer # Removed until SERVER-38499 is resolved.
+    #- name: concurrency_sharded_replication_multi_stmt_txn # Removed until SERVER-38499 is resolved.
+    #- name: concurrency_sharded_replication_multi_stmt_txn_with_balancer # Removed until SERVER-38499 is resolved.
+  - name: fle
+  - name: .jscore .common !.auth
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
+  - name: .sharding .txns
   - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
   - name: sharding_jscore_passthrough
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: publish_packages
-    distros:
-    - ubuntu1804-test
-  - name: push
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
     distros:
     - ubuntu1804-test
 
@@ -8653,100 +8442,32 @@ buildvariants:
     distros:
     - ubuntu1604-zseries-large
   - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
   - name: aggregation_read_concern_majority_passthrough
   - name: aggregation_sharded_collections_passthrough
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - ubuntu1604-zseries-large
-  - name: integration_tests_sharded
+  - name: .encrypt
+  - name: .integration !.audit
     distros:
     - ubuntu1604-zseries-large
-  - name: integration_tests_standalone
-    distros:
-    - ubuntu1604-zseries-large
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.auth
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version !.jscore
+  - name: .sharding .txns
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
-  - name: publish_packages
-    distros:
-    - ubuntu1604-test
-  - name: push
+  - name: .stitch
+  - name: .publish
     distros:
     - ubuntu1604-test
 
@@ -8781,10 +8502,7 @@ buildvariants:
   - name: jsCore
   - name: replica_sets_jscore_passthrough
   - name: ssl_gen
-  - name: publish_packages
-    distros:
-    - ubuntu1804-test
-  - name: push
+  - name: .publish
     distros:
     - ubuntu1804-test
 
@@ -8821,98 +8539,31 @@ buildvariants:
     distros:
     - ubuntu1804-zseries-build
   - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
   - name: aggregation_read_concern_majority_passthrough
   - name: aggregation_sharded_collections_passthrough
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - ubuntu1804-zseries-build
-  - name: integration_tests_sharded
+  - name: .encrypt
+  - name: .integration !.audit
     distros:
     - ubuntu1804-zseries-build
-  - name: integration_tests_standalone
-    distros:
-    - ubuntu1804-zseries-build
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.auth
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version
+  - name: .sharding .txns
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
-  - name: write_concern_majority_passthrough
-  - name: publish_packages
-    distros:
-    - ubuntu1804-test
-  - name: push
+  - name: .publish
     distros:
     - ubuntu1804-test
 
@@ -8945,65 +8596,31 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - amazon1-2018-build
-  - name: aggregation_auth
+  - name: .aggfuzzer .common
   - name: aggregation
+  - name: .auth !.gle !.multiversion
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: ese
-  - name: failpoints_auth
-  - name: fle
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: bulk_gle_passthrough
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.aggregation
+  - name: .jscore .common !.compat
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: noPassthrough_gen
   - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_jscore_passthrough
   - name: powercycle
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: slow1_gen
   - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .txns
+  - name: slow1_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: amazon
   display_name: SSL Amazon Linux
@@ -9034,79 +8651,32 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - amazon1-2018-build
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
     distros:
-    - amazon1-2018-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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
+      - amazon1-2018-build
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: multiversion
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
+  - name: .replica_sets .common
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.op_query !.csrs
+  - name: .sharding .txns
+  - name: .ssl
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: enterprise-amazon2
   display_name: "Enterprise Amazon Linux 2"
@@ -9141,64 +8711,30 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - amazon2-build
-  - name: aggregation_auth
+  - name: .aggfuzzer .common
   - name: aggregation
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: ese
-  - name: failpoints_auth
-  - name: fle
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .auth !.gle !.multiversion
+  - name: bulk_gle_passthrough
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.aggregation
+  - name: .jscore .common !.compat
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: noPassthrough_gen
   - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: slow1_gen
   - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .txns !.csrs
+  - name: slow1_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: amazon2
   display_name: SSL Amazon Linux 2
@@ -9233,79 +8769,32 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - amazon2-build
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
     distros:
-    - amazon2-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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
+      - amazon2-build
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: multiversion
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
+  - name: .replica_sets .common
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.op_query !.csrs
+  - name: .sharding .txns
+  - name: .ssl
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 ###########################################
 #         Windows buildvariants           #
@@ -9380,147 +8869,38 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - windows-64-vs2017-compile
-  - name: aggregation
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation !.auth !.encrypt
   - name: aggregation_expression_multiversion_fuzzer_gen
   - name: auth_gen
-  - 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
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
+  - name: bulk_gle_passthrough
+  - name: .causally_consistent !.sharding
+  - name: .change_streams !.secondary_reads
+  - name: .misc_js !.non_win_dbg
+    # Some concurrency workloads require a lot of memory, so we use machines
+    # with more RAM for these suites.
+  - name: .concurrency !.ubsan !.no_txns
+    distros:
+      - windows-64-vs2017-compile
   - name: disk_wiredtiger
-  - name: failpoints
   - name: free_monitoring
   - name: initial_sync_fuzzer_gen
-  - name: integration_tests_standalone
+  - name: .integration !.audit
     distros:
     - windows-64-vs2017-compile
-  - name: integration_tests_replset
-    distros:
-    - windows-64-vs2017-compile
-  - name: integration_tests_sharded
-    distros:
-    - windows-64-vs2017-compile
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .jscore .common !.auth !.sharding
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - 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: mongosTest
+  - name: .logical_session_cache .one_sec
   - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  # Some concurrency workloads require a lot of memory, so we use machines
-  # with more RAM for these suites.
-  - name: concurrency
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_replication
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_replication_causal_consistency
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_replication_multi_stmt_txn
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_replication
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_replication_with_balancer
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_multi_stmt_txn
+  - name: .read_write_concern !.large
+  - name: .read_write_concern .large
     distros:
     - windows-64-vs2017-compile
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_with_stepdowns
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_simultaneous
-    distros:
-    - windows-64-vs2017-compile
-  - name: concurrency_simultaneous_replication
-    distros:
-    - windows-64-vs2017-compile
-  - name: read_concern_linearizable_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_initsync_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_initsync_static_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-  - name: replica_sets_kill_primary_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_terminate_primary_jscore_passthrough
-    distros:
-    - windows-64-vs2017-compile
-  - name: replica_sets_kill_secondaries_jscore_passthrough
+  - name: .read_only
+  - name: .rollbackfuzzer
+  - name: .replica_sets !.large !.encrypt !.auth
+  - name: .replica_sets .large
     distros:
     - windows-64-vs2017-compile
   - name: retryable_writes_jscore_passthrough_gen
@@ -9529,12 +8909,7 @@ buildvariants:
     - windows-64-vs2017-compile
   - name: session_jscore_passthrough
   - name: sharding_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
-    distros:
-    - windows-64-vs2017-compile
+  - name: .stitch
 
 - name: enterprise-windows-64-2k8
   display_name: "* Enterprise Windows 2008R2"
@@ -9560,54 +8935,35 @@ buildvariants:
     distros:
     - windows-64-vs2017-compile
   - name: burn_in_tests_gen
+  - name: .aggfuzzer
   - name: audit
   - name: auth_audit_gen
-  - name: benchmarks_orphaned
-  - name: benchmarks_sharding
+  - name: .benchmarks
   - name: buildscripts_test
+  - name: causally_consistent_jscore_txns_passthrough
   - name: dbtest_TG
     distros:
     - windows-64-vs2017-compile
-  - name: ese
+  - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore
   - name: external_auth
     distros:
     - windows-64-2016
-  - name: fle
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_decimal
+  - name: .jscore .common !.compat !.sharding
   - name: jsCore_auth
-  - name: jsCore_txns
+  - name: jsCore_ese
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_expression_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
+  - name: .jstestfuzz .common
   - name: noPassthrough_gen
   - name: noPassthroughWithMongod_gen
-  - name: replica_sets_auth_gen
+  - name: .replica_sets .common
+  - name: .replica_sets .multi_oplog
   - name: replica_sets_ese_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
+  - name: .sharding .txns
   - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
   - name: sharding_ese_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: jsCore_txns_multi_oplog_entries
   - name: push
     distros:
     - rhel70-small
@@ -9711,47 +9067,27 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - windows-64-vs2017-compile
+  - name: .aggfuzzer .common
   - name: audit
   - name: auth_audit_gen
-  - name: concurrency
-  - name: concurrency_replication
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
     distros:
     - windows-64-vs2017-compile
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: read_concern_linearizable_passthrough
+  - name: .jscore .common !.decimal !.compat !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern .linearize
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: replica_sets_multi_stmt_txn_jscore_passthrough
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
+  - name: .sharding .txns
   - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
+  - name: .ssl
 
 - name: windows-64-2k8-ssl
   display_name: Windows 2008R2
@@ -9785,94 +9121,34 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - windows-64-vs2017-compile
-  - name: aggregation
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggfuzzer .common
+  - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth .gle
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common !.txn
   - name: concurrency_replication_causal_consistency
     distros:
     - windows-64-vs2017-compile
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
   - name: disk_wiredtiger
-  - name: failpoints
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
+  - name: .jscore .common !.auth
   - name: jsonSchema
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - name: jstestfuzz_sharded_causal_consistency_gen
-  - name: jstestfuzz_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_sharded_session_gen
-  - 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: mongosTest
+  - name: .jstestfuzz !.initsync
+  - name: .logical_session_cache .one_sec
   - name: multiversion
   - name: multiversion_auth
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: powercycle
-  - name: powercycle_fcv4.0
-  - name: powercycle_kill_mongod
-  - name: powercycle_replication
-  - name: powercycle_syncdelay
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .powercycle
+  - name: .read_write_concern
   - name: replica_sets
   - name: replica_sets_jscore_passthrough
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
-  - name: write_concern_majority_passthrough
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .txns
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
+  - name: .stitch
+  - name: .updatefuzzer
   - name: push
     distros:
     - rhel70-small
@@ -9932,105 +9208,33 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: aggregation
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation !.auth !.encrypt !.unwind
+  - name: .auth .gle
   - name: auth_gen
-  - name: bulk_gle_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
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
+  - name: .causally_consistent !.sharding
+  - name: .change_streams !.secondary_reads
+  - name: .misc_js
+  - name: .concurrency !.ubsan !.no_txns
   - name: disk_wiredtiger
-  - name: failpoints
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
   - name: initial_sync_fuzzer_gen
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - name: jstestfuzz_sharded_causal_consistency_gen
-  - name: jstestfuzz_sharded_session_gen
-  - 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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_majority_passthrough_gen
+  - name: .jscore .common !.auth
+  - name: .jstestfuzz .causal
+  - name: .jstestfuzz .interrupt
+  - name: .jstestfuzz .common
+  - name: .jstestfuzz .session
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern !.linearize
   - name: replica_sets
-  - name: replica_sets_jscore_passthrough
   - name: replica_sets_kill_secondaries_jscore_passthrough
+  - name: .replica_sets .common !.auth
   - name: retryable_writes_jscore_passthrough_gen
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: serial_run
+  - name: .rollbackfuzzer
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: slow1_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .txns
+  - name: .ssl
+  - name: .stitch
   - name: push
     distros:
     - rhel70-small
@@ -10052,21 +9256,16 @@ buildvariants:
   - name: compile_all_run_unittests_TG
   - name: aggregation
   - name: auth_gen
+  - name: causally_consistent_jscore_txns_passthrough
   - name: disk_wiredtiger
   - name: failpoints
-  - name: jsCore
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .jscore .common !.auth !.sharding
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: mongosTest
   - name: replica_sets
   - name: replica_sets_multi_oplog_txns_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .ssl
+  - name: .stitch
   - name: tool
 
 - name: enterprise-macos
@@ -10095,26 +9294,14 @@ buildvariants:
   - name: compile_all_run_unittests_TG
   - name: audit
   - name: auth_audit_gen
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.replica_sets !.sharding !.aggregation !.jscore
+  - name: .jscore .common !.compat !.decimal !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
-  - name: ssl_gen
-  - name: sslSpecial_gen
   - name: push
     distros:
     - rhel70-small
@@ -10147,22 +9334,12 @@ buildvariants:
   - name: compile_all_run_unittests_TG
   - name: audit
   - name: auth_audit_gen
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
+  - name: .encrypt !.replica_sets !.sharding !.aggregation !.jscore
+  - name: .jscore .common !.compat !.decimal !.sharding
+  - name: .jstestfuzz .common
   - name: replica_sets_auth_gen
   - name: sasl
-  - name: ssl_gen
-  - name: sslSpecial_gen
 
 
 ###########################################
@@ -10640,231 +9817,67 @@ buildvariants:
   - name: burn_in_tests_gen
     distros:
     - rhel62-large
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggfuzzer
+  - name: .aggregation
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: benchmarks_orphaned
-    distros:
-    - centos6-perf
-  - name: benchmarks_sharding
+  - name: .auth
+  - name: .benchmarks
     distros:
     - centos6-perf
   - name: buildscripts_test
-  - name: bulk_gle_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
-  - name: change_streams_secondary_reads
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_secondary_reads_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_secondary_reads_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
+  - name: .causally_consistent !.sharding
+  - name: .change_streams
+  - name: .misc_js
+  - name: .concurrency !.large !.ubsan !.no_txns
+  - name: .concurrency .large !.ubsan !.no_txns
     distros:
     - rhel62-large
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
   - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
+  - name: .encrypt
   - name: idl_tests
   - name: initial_sync_fuzzer_gen
-  - name: integration_tests_replset
-    distros:
-    - rhel62-large
-  - name: integration_tests_sharded
+  - name: .integration
     distros:
     - rhel62-large
-  - name: integration_tests_standalone
-    distros:
-    - rhel62-large
-  - name: integration_tests_standalone_audit
-    distros:
-    - rhel62-large
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_expression_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_initsync_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - 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_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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
-  - name: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough_gen
+  - name: .jstestfuzz
+  - name: .logical_session_cache
+  - name: .multi_shard
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: multiversion_auth
   - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-    distros:
-    - rhel62-large
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-    distros:
-    - rhel62-large
-  - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_initsync_static_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
+  - name: .read_write_concern .large
     distros:
     - rhel62-large
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_kill_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_terminate_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_kill_secondaries_jscore_passthrough
+  - name: .read_write_concern !.large
+  - name: .replica_sets !.encrypt !.auth
     distros:
     - rhel62-large
   - name: retryable_writes_jscore_passthrough_gen
   - name: retryable_writes_jscore_stepdown_passthrough
     distros:
     - rhel62-large
+  - name: .read_only
+  - name: .rollbackfuzzer
   - name: sasl
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .txns
+  - name: .sharding .common
   - name: sharded_multi_stmt_txn_jscore_passthrough
     distros:
     - rhel62-large
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
-  - name: write_concern_majority_passthrough
-    distros:
-    - rhel62-large
+  - name: .stitch
+  - name: .updatefuzzer
   - name: secondary_reads_passthrough_gen
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: enterprise-rhel-62-64-bit-multi-txn-oplog-entries
   display_name: "Enterprise RHEL 6.2 (Multiple oplog entries transaction format)"
@@ -11001,175 +10014,54 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggfuzzer !.wildcard
+  - name: .aggregation !.read_write_concern
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
+  - name: .auth !.multiversion
   - name: buildscripts_test
-  - name: bulk_gle_passthrough
-  - name: change_streams
-  - name: change_streams_mongos_passthrough
-  - name: change_streams_mongos_sessions_passthrough
-  - name: change_streams_secondary_reads
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_secondary_reads_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_secondary_reads_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: causally_consistent_jscore_passthrough_gen
-  - name: causally_consistent_jscore_passthrough_auth_gen
-  - name: sharded_causally_consistent_jscore_passthrough_gen
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .causally_consistent !.txns
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .change_streams
+  - name: .misc_js !.non_read_maj
+  - name: .concurrency .common !.read_concern_maj
+  - name: .concurrency .no_txns
+  - name: concurrency_sharded_causal_consistency_gen
+  - name: concurrency_sharded_causal_consistency_and_balancer
   - name: concurrency_replication_causal_consistency
     distros:
     - rhel62-large
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication_no_txns
-  - name: concurrency_sharded_replication_no_txns_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
   - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
+  - name: .encrypt
   - name: initial_sync_fuzzer_gen
-  - name: integration_tests_replset
-    distros:
-    - rhel62-large
-  - name: integration_tests_sharded
-    distros:
-    - rhel62-large
-  - name: integration_tests_standalone
-    distros:
-    - rhel62-large
-  - name: integration_tests_standalone_audit
+  - name: .integration
     distros:
     - rhel62-large
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_expression_multiversion_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_initsync_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - 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_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: .jstestfuzz
+  - name: .logical_session_cache .repl
   - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-    distros:
-    - rhel62-large
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-    distros:
-    - rhel62-large
-  - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_initsync_jscore_passthrough
+  - name: .read_write_concern .large
     distros:
     - rhel62-large
-  - name: replica_sets_initsync_static_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_oplog_txns_gen
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_kill_secondaries_jscore_passthrough
+  - name: .replica_sets !.auth !.encrypt !.non_maj_read
     distros:
     - rhel62-large
   - name: retryable_writes_jscore_passthrough_gen
+  - name: .read_only
+  - name: .rollbackfuzzer
   - name: sasl
+  - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
-  - name: sharded_collections_jscore_passthrough
   # Sharded transactions suites exclude tests that use snapshot read concern, since snapshot read
   # concern uses 'atClusterTime' in sharded clusters, and this is not supported with
   # enableMajorityReadConcern=false.
-  - name: sharded_causally_consistent_jscore_txns_passthrough_without_snapshot_gen
-  - name: sharded_jscore_txns_without_snapshot
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.txns
+  - name: .sharding .common
   - name: snmp
-  - 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_gen
+  - name: .updatefuzzer
 
 - name: enterprise-rhel-62-64-bit-flow-control-off
   display_name: "Enterprise RHEL 6.2 (flow control off)"
@@ -11203,245 +10095,81 @@ buildvariants:
   - name: dbtest_TG
     distros:
     - rhel62-large
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggfuzzer
+  - name: .aggregation
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_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
-  - name: change_streams_secondary_reads
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_secondary_reads_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_secondary_reads_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
+  - name: .auth
+  - name: .causally_consistent !.wo_snapshot
+  - name: .change_streams
+  - name: .misc_js
+  - name: .concurrency !.ubsan !.no_txns !.large
+  - name: .concurrency !.ubsan !.no_txns .large
     distros:
     - rhel62-large
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
   - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
+  - name: .encrypt
   - name: initial_sync_fuzzer_gen
-  - name: integration_tests_replset
-    distros:
-    - rhel62-large
-  - name: integration_tests_sharded
+  - name: .integration
     distros:
     - rhel62-large
-  - name: integration_tests_standalone
-    distros:
-    - rhel62-large
-  - name: integration_tests_standalone_audit
-    distros:
-    - rhel62-large
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_expression_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_initsync_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - 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_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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
-  - name: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
+  - name: .jstestfuzz
+  - name: .logical_session_cache
+  - name: .multi_shard  .common
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
   - name: multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough_gen
-  - name: multiversion_auth
   - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-    distros:
-    - rhel62-large
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-    distros:
-    - rhel62-large
-  - name: replica_sets_auth_gen
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_initsync_static_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_kill_primary_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: replica_sets_terminate_primary_jscore_passthrough
+  - name: .read_write_concern !.aggregation
     distros:
-    - rhel62-large
-  - name: replica_sets_kill_secondaries_jscore_passthrough
+      - rhel62-large
+  - name: .replica_sets !.encrypt !.auth
     distros:
     - rhel62-large
   - name: retryable_writes_jscore_passthrough_gen
-  - name: retryable_writes_jscore_stepdown_passthrough
-    distros:
-    - rhel62-large
+  - name: .read_only
+  - name: .retry
+  - name: .rollbackfuzzer
   - name: sasl
+  - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-    distros:
-    - rhel62-large
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot
+  - name: .sharding .common
   - name: snmp
-  - 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_gen
+  - name: .updatefuzzer
 
 - name: enterprise-rhel-62-64-bit-required-majority-read-concern-off
   display_name: "! Enterprise RHEL 6.2 (majority read concern off)"
   modules:
-  - enterprise
+    - enterprise
   run_on:
-  - rhel62-small
+    - rhel62-small
   expansions:
     <<: *enterprise-rhel-62-64-bit-majority-read-concern-off-expansions
     burn_in_tests_build_variant: enterprise-rhel-62-64-bit-majority-read-concern-off
   tasks:
-  # This build variants exists specifically to test that newly added or modified JavaScript tests
-  # are correctly tagged with "requires_majority_read_concern", "uses_change_streams",
-  # "uses_prepare_transaction", and "uses_multi_shard_transaction" prior to the changes being
-  # pushed. It uses the task list from the enterprise-rhel-62-64-bit-majority-read-concern-off
-  # build variant to determine the resmoke.py YAML suite configurations to run the tests under. Do
-  # not add more tasks to this list.
-  - name: compile_TG
-    requires:
+    # This build variants exists specifically to test that newly added or modified JavaScript tests
+    # are correctly tagged with "requires_majority_read_concern", "uses_change_streams",
+    # "uses_prepare_transaction", and "uses_multi_shard_transaction" prior to the changes being
+    # pushed. It uses the task list from the enterprise-rhel-62-64-bit-majority-read-concern-off
+    # build variant to determine the resmoke.py YAML suite configurations to run the tests under. Do
+    # not add more tasks to this list.
+    - name: compile_TG
+      requires:
+        - name: burn_in_tests_gen
+      distros:
+        - rhel62-large
     - name: burn_in_tests_gen
-    distros:
-    - rhel62-large
-  - name: burn_in_tests_gen
 
 - name: enterprise-rhel-62-64-bit-coverage
   display_name: "~ Enterprise RHEL 6.2 DEBUG Code Coverage"
   modules:
-  - enterprise
+    - enterprise
   run_on:
-  - rhel62-large
+    - rhel62-large
   batchtime: 10080 # 7 days
   stepback: false
   expansions:
@@ -11460,141 +10188,40 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
   display_tasks:
-  - *dbtest
-  - *unittests
+    - *dbtest
+    - *unittests
   tasks:
-  - name: compile_all_run_unittests_TG
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
-  - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: change_streams
-  - name: change_streams_mongos_passthrough
-  - name: change_streams_mongos_sessions_passthrough
-  - name: change_streams_secondary_reads
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_secondary_reads_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_secondary_reads_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: initial_sync_fuzzer_gen
-  - name: integration_tests_replset
-  - name: integration_tests_sharded
-  - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_minimum_batch_size
-  - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_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: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
-  - name: multiversion_auth
-  - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-  - name: replica_sets_initsync_static_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-  - 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_gen
-  - name: sasl
-  - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_op_query_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
-  - name: write_concern_majority_passthrough
-  - name: secondary_reads_passthrough_gen
+    - name: compile_all_run_unittests_TG
+    - name: .aggregation !.unwind
+    - name: audit
+    - name: .auth
+    - name: causally_consistent_jscore_txns_passthrough
+    - name: .change_streams
+    - name: .misc_js !.tool
+    - name: .concurrency !.ubsan !.no_txns !.stepdowns
+    - name: disk_wiredtiger
+    - name: .encrypt
+    - name: initial_sync_fuzzer_gen
+    - name: .integration !.audit
+    - name: .jscore .common
+    - name: jsCore_txns_multi_oplog_entries
+    - name: jsCore_minimum_batch_size
+    - name: jsCore_op_query
+    - name: .logical_session_cache .one_sec
+    - name: .multi_shard .common
+    - name: multiversion
+    - name: .read_write_concern
+    - name: .replica_sets
+    - name: .read_only
+    - name: .rollbackfuzzer
+    - name: retryable_writes_jscore_passthrough_gen
+    - name: sasl
+    - name: secondary_reads_passthrough_gen
+    - name: session_jscore_passthrough
+    - name: .sharding .jscore !.wo_snapshot
+    - name: .sharding .common
+    - name: snmp
+    - name: .updatefuzzer
 
 - &enterprise-rhel-70-64-bit-template
   name: enterprise-rhel-70-64-bit
@@ -11628,48 +10255,30 @@ buildvariants:
   - name: compile_benchmarks
     distros:
     - rhel70
+  - name: .aggfuzzer
   - name: audit
-  - name: auth_gen
   - name: auth_audit_gen
-  - name: benchmarks_orphaned
-  - name: benchmarks_sharding
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
-  - name: jsCore_txns_multi_oplog_entries
+  - name: auth_gen
+  - name: .benchmarks
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_expression_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.sharding !.replica_sets !.aggregation !.jscore
   - name: external_auth
+  - name: .jscore .common !.compat !.decimal !.sharding
+  - name: jsCore_txns_multi_oplog_entries
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
+  - name: .replica_sets .multi_oplog
   - name: sasl
-  - name: sharding_auth_gen
   - name: sharding_auth_audit_gen
+  - name: sharding_auth_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 # This variant is to intentionally test uncommon features nightly
 - <<: *enterprise-rhel-70-64-bit-template
@@ -11720,15 +10329,13 @@ buildvariants:
     distros:
     - ubuntu1604-build
   - name: jsCore
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .read_write_concern !.write !.aggregation
   - name: replica_sets_jscore_passthrough
   - name: replica_sets_multi_oplog_txns_jscore_passthrough
   - name: sharded_collections_jscore_passthrough
   - name: sharding_gen
   - name: sharding_auth_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .stitch
 
 - name: rhel62
   display_name: SSL RHEL 6.2
@@ -11758,87 +10365,31 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
+  - name: .auth !.multiversion !.audit
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
+  - name: concurrency_replication_causal_consistency
+    distros:
+      - rhel62-large
   - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
   - name: fle
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
-  - name: mongosTest
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache
   - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-    distros:
-    - rhel62-large
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
+  - name: .replica_sets .common
+  - name: .sharding .txns
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: rhel70
   display_name: SSL RHEL 7.0
@@ -11869,87 +10420,31 @@ buildvariants:
     distros:
     - rhel70
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
+  - name: .misc_js
+  - name: .concurrency .common
     distros:
-    - rhel70
-  - name: concurrency_replication
-    distros:
-    - rhel70
+      - rhel70
   - name: concurrency_replication_causal_consistency
     distros:
-    - rhel70
-  - name: concurrency_replication_multi_stmt_txn
-    distros:
-    - rhel70
-  - name: concurrency_sharded_replication
-    distros:
-    - rhel70
-  - name: concurrency_sharded_replication_with_balancer
-    distros:
-    - rhel70
-  - name: concurrency_simultaneous
-    distros:
-    - rhel70
-  - name: concurrency_simultaneous_replication
-    distros:
-    - rhel70
-  - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharding_jscore_passthrough
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
+      - rhel70
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: multiversion
+  - replica_sets
+  - name: .replica_sets .common
+  - name: .sharding .txns
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 # This variant compiles on RHEL 7.0 and runs tests on RHEL 7.6
 - name: rhel76_compile_rhel70
@@ -12000,104 +10495,32 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel71-power8-build
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation .common
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - rhel71-power8-build
-  - name: integration_tests_sharded
+  - name: .encrypt
+  - name: .integration !.audit
     distros:
     - rhel71-power8-build
-  - name: integration_tests_standalone
-    distros:
-    - rhel71-power8-build
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.auth
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .aggfuzzer .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough_gen
-  - name: publish_packages
-    distros:
-    - rhel70-small
-  - name: push
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version
+  - name: snmp
+  - name: .stitch
+  - name: .publish
     distros:
     - rhel70-small
 
@@ -12133,102 +10556,31 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel72-zseries-build
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation .common
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - rhel72-zseries-build
-  - name: integration_tests_sharded
+  - name: .encrypt
+  - name: .integration !.audit
     distros:
     - rhel72-zseries-build
-  - name: integration_tests_standalone
-    distros:
-    - rhel72-zseries-build
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.auth
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough_gen
-  - name: publish_packages
-    distros:
-    - rhel70-small
-  - name: push
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version
+  - name: snmp
+  - name: .stitch
+  - name: .publish
     distros:
     - rhel70-small
 
@@ -12260,95 +10612,31 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel67-zseries-build
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation .common
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.multiversion
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
+  - name: .encrypt
+  - name: .integration !.audit !.sharded
     distros:
     - rhel67-zseries-build
-  - name: integration_tests_standalone
-    distros:
-    - rhel67-zseries-build
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
+  - name: .stitch
   - name: secondary_reads_passthrough_gen
-  - name: publish_packages
-    distros:
-    - rhel62-large
-  - name: push
+  - name: .publish
     distros:
     - rhel62-large
 
@@ -12380,10 +10668,7 @@ buildvariants:
   - name: jsCore
   - name: replica_sets_jscore_passthrough
   - name: ssl_gen
-  - name: publish_packages
-    distros:
-    - rhel70
-  - name: push
+  - name: .publish
     distros:
     - rhel70
 
@@ -12415,10 +10700,7 @@ buildvariants:
   - name: jsCore
   - name: replica_sets_jscore_passthrough
   - name: ssl_gen
-  - name: publish_packages
-    distros:
-    - rhel62-large
-  - name: push
+  - name: .publish
     distros:
     - rhel62-large
 
@@ -12455,55 +10737,27 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - ubuntu1604-build
+  - name: .aggfuzzer .common
   - name: audit
-  - name: ese
-  - name: fle
-  - name: jepsen_register_findAndModify
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_register_linearizableRead
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_set_linearizableRead
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_read-concern-majority
-    distros:
-    - ubuntu1604-build
-  - name: jepsen_read-concern-majority_w1
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+  - name: .jepsen
     distros:
     - ubuntu1604-build
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .jscore .common !.compat !.decimal !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: sharding_auth_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: watchdog_inmemory
-  - name: watchdog_wiredtiger
+  - name: .stitch
+  - name: .watchdog
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 
 - name: enterprise-ubuntu-dynamic-1604-clang
@@ -12580,39 +10834,23 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - suse12-build
+  - name: .aggfuzzer .common
   - name: audit
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+  - name: .jscore .common !.compat !.decimal !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: sharding_auth_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
-
+  - name: .publish
 
 - name: enterprise-suse12-s390x
   display_name: Enterprise SLES 12 s390x
@@ -12645,102 +10883,31 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - suse12-zseries-build
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation .common
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .auth !.multiversion !.jscore
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - suse12-zseries-build
-  - name: integration_tests_sharded
+  - name: .encrypt
+  - name: .integration !.audit
     distros:
     - suse12-zseries-build
-  - name: integration_tests_standalone
-    distros:
-    - suse12-zseries-build
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.auth
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_csrs_continuous_config_stepdown_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: write_concern_majority_passthrough
+  - name: .stitch
   - name: secondary_reads_passthrough_gen
-  - name: publish_packages
-    distros:
-    - suse12-test
-  - name: push
+  - name: .publish
     distros:
     - suse12-test
 
@@ -12776,10 +10943,7 @@ buildvariants:
   - name: jsCore
   - name: replica_sets_jscore_passthrough
   - name: ssl_gen
-  - name: publish_packages
-    distros:
-    - suse12-test
-  - name: push
+  - name: .publish
     distros:
     - suse12-test
 
@@ -12812,72 +10976,28 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - suse12-build
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
     distros:
-    - suse12-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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
+      - suse12-build
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common !.decimal
+  - name: .jstestfuzz .common
+  - name: multiversion
+  - name: .logical_session_cache .one_sec
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: publish_packages
-  - name: push
+  - name: .replica_sets .common
+  - name: .sharding .txns
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
 
 - name: enterprise-suse15-64
   display_name: Enterprise SLES 15
@@ -12907,35 +11027,20 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - suse15-build
+  - name: .aggfuzzer .common
   - name: audit
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+  - name: .jscore .common !.decimal !.compat !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: sharding_auth_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: publish_packages
-  - name: push
+  - name: .stitch
+  - name: .publish
 
 - name: suse15
   display_name: SSL SUSE 15
@@ -12965,73 +11070,28 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - suse15-build
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
-  - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
     distros:
-    - suse15-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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
+      - suse15-build
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common !.decimal
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: multiversion
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: publish_packages
-  - name: push
-
+  - name: .replica_sets .common
+  - name: .sharding .txns
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
 
 ###########################################
 #          Debian buildvariants           #
@@ -13069,38 +11129,23 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - debian92-build
+  - name: .aggfuzzer .common
   - name: audit
-  - name: ese
-  - name: fle
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+  - name: .jscore .common !.decimal !.compat !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: sharding_auth_gen
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 - name: debian92
   display_name: SSL Debian 9.2
@@ -13133,78 +11178,32 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - debian92-build
+  - name: .aggfuzzer .common
   - name: aggregation
   - name: aggregation_auth
-  - name: auth_gen
-  - name: disk_wiredtiger
-  - name: failpoints
-  - name: failpoints_auth
-  - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_txns
+  - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - name: mongosTest
-  - name: multiversion
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
     distros:
-    - debian92-build
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - 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
+      - debian92-build
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common !.decimal
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: multiversion
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
+  - name: .replica_sets .common
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
+  - name: .stitch
   - name: package
     distros:
     - ubuntu1604-packer
-  - name: publish_packages
-  - name: push
+  - name: .publish
 
 ################################
 # storage engine buildvariants #
@@ -13254,179 +11253,47 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
-  - name: aggregation
-  - name: aggregation_auth
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggfuzzer .common
+  - name: .aggregation !.unwind !.encrypt
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_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
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_replication
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_replication_causal_consistency
+  - name: .auth !.multiversion
+  - name: .causally_consistent !.wo_snapshot
+  - name: .change_streams !.secondary_reads
+  - name: .misc_js
+  - name: .concurrency !.ubsan !.no_txns
     distros:
     - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_replication_with_balancer
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_multi_stmt_txn
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_with_stepdowns
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_simultaneous
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: concurrency_simultaneous_replication
-    distros:
-    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
-  - name: failpoints
-  - name: failpoints_auth
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - rhel62-large
-  - name: integration_tests_sharded
-    distros:
-    - rhel62-large
-  - name: integration_tests_standalone
+  - name: .integration !.audit
     distros:
     - rhel62-large
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
+  - name: .jscore .common !.decimal
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - name: jstestfuzz_sharded_session_gen
-  - name: jstestfuzz_sharded_causal_consistency_gen
-  - 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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
-  - name: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
+  - name: .jstestfuzz !.initsync
+  - name: .logical_session_cache
+  - name: .multi_shard .common
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
+  - name: .replica_sets .common
+  - name: .replica_sets .multi_oplog
   - name: replica_sets_multi_stmt_txn_jscore_passthrough
   - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
     distros:
     - rhel62-large
-  - name: retryable_writes_jscore_passthrough_gen
-  - name: retryable_writes_jscore_stepdown_passthrough
+  - name: .retry
   - name: rollback_fuzzer_gen
   - name: sasl
+  - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharded_collections_jscore_passthrough
   - name: sharded_multi_stmt_txn_jscore_passthrough
     distros:
     - rhel62-large
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version !.csrs
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
-  - name: write_concern_majority_passthrough
-  - name: secondary_reads_passthrough_gen
+  - name: .ssl
+  - name: .updatefuzzer
 
 - name: enterprise-rhel-62-64-bit-required-inmem
   display_name: "! Enterprise RHEL 6.2 (inMemory)"
@@ -13496,54 +11363,26 @@ buildvariants:
   - name: aggregation_auth
   - name: aggregation_facet_unwind_passthrough
   - name: auth_gen
-  - name: concurrency
-  - name: benchrun_embedded_aggregation
-    distros:
-    - centos6-perf
-  - name: benchrun_embedded_commands
-    distros:
-    - centos6-perf
-  - name: benchrun_embedded_insert
+  - name: .benchrun !.perf
+  - name: .benchrun .perf
     distros:
-    - centos6-perf
-  - name: benchrun_embedded_misc
-    distros:
-    - centos6-perf
-  - name: benchrun_embedded_mixed_and_multi
-    distros:
-    - centos6-perf
-  - name: benchrun_embedded_queries
-    distros:
-    - centos6-perf
-  - name: benchrun_embedded_remove
-    distros:
-    - centos6-perf
-  - name: benchrun_embedded_update
-    distros:
-    - centos6-perf
+      - centos6-perf
+  - name: .misc_js !.non_mobile
+  - name: concurrency
   - name: disk_mobile
-  - name: failpoints
   - name: failpoints_auth
-  - name: generate_benchrun_embedded_files
   - name: integration_tests_standalone
     distros:
     - rhel62-large
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.txns !.sharding
   - name: jsCore_minimum_batch_size
   - name: jsCore_mobile
   - name: jsCore_op_query
   - name: jsonSchema
   - name: jstestfuzz_gen
   - name: jstestfuzz_concurrent_gen
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
   - name: powercycle_mobile
-  - name: serial_run
   - name: session_jscore_passthrough
-  - name: upload_benchrun_embedded_files
 
 - name: ubuntu1604-arm64-mobile
   display_name: "Ubuntu 16.04 arm64 (mobile)"
@@ -13575,24 +11414,18 @@ buildvariants:
   - name: aggregation_auth
   - name: aggregation_facet_unwind_passthrough
   - name: auth_gen
+  - name: .misc_js !.non_mobile
   - name: concurrency
   - name: disk_mobile
-  - name: failpoints
   - name: failpoints_auth
   - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.txns !.sharding
   - name: jsCore_minimum_batch_size
   - name: jsCore_mobile
   - name: jsCore_op_query
   - name: jsonSchema
   - name: jstestfuzz_gen
   - name: jstestfuzz_concurrent_gen
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: serial_run
   - name: session_jscore_passthrough
 
 - name: rhel-62-64-bit-required-mobile
@@ -13650,27 +11483,19 @@ buildvariants:
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
-  - name: aggregation_auth
   - name: aggregation_facet_unwind_passthrough
-  - name: auth_gen
+  - name: .auth !.multiversion !.gle !.audit !.replica_sets !.sharding
+  - name: .misc_js !.non_mobile
   - name: concurrency
   - name: disk_mobile
-  - name: failpoints
-  - name: failpoints_auth
   - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .jscore .common !.txns !.sharding
   - name: jsCore_minimum_batch_size
   - name: jsCore_mobile
   - name: jsCore_op_query
   - name: jsonSchema
   - name: jstestfuzz_gen
   - name: jstestfuzz_concurrent_gen
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: serial_run
   - name: session_jscore_passthrough
 
 - name: linux-64-ephemeralForTest
@@ -13693,9 +11518,10 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
+  - name: .aggfuzzer .common
   - name: aggregation
-  - name: aggregation_auth
-  - name: auth_gen
+  - name: .auth !.multiversion !.audit
+  - name: .misc_js
   - name: concurrency
     distros:
     - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
@@ -13709,65 +11535,20 @@ buildvariants:
   - name: concurrency_simultaneous_replication
     distros:
     - rhel62-large
-  - name: failpoints
-  - name: failpoints_auth
-  - name: gle_auth
-  - name: gle_auth_write_cmd
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: integration_tests_standalone
-    distros:
-    - rhel62-large
-  - name: integration_tests_replset
+  - name: .integration !.audit
     distros:
     - rhel62-large
-  - name: integration_tests_sharded
-    distros:
-    - rhel62-large
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: jsCore
-  - name: jsCore_auth
+  - name: .jscore .common !.txns !.decimal
   - name: jsCore_op_query
-  - name: jsCore_compatibility
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_sharded_gen
-  - 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: mongosTest
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: bulk_gle_passthrough
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern .linearize
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: rollback_fuzzer_gen
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: tool
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
+  - name: .sharding .common !.mixed_version !.csrs
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .updatefuzzer
 
 - name: enterprise-rhel-71-ppc64le-inmem
   display_name: Enterprise RHEL 7.1 PPC64LE (inMemory) DEBUG
@@ -13791,78 +11572,29 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel71-power8-build
-  - name: aggregation
-  - name: aggregation_auth
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation .common
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
+  - name: .auth !.multiversion
+  - name: .misc_js
+  - name: .concurrency .common !.repl
   - name: concurrency_replication
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
-  - name: failpoints
-  - name: failpoints_auth
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - rhel71-power8-build
-  - name: integration_tests_sharded
-    distros:
-    - rhel71-power8-build
-  - name: integration_tests_standalone
+  - name: .integration !.audit
     distros:
     - rhel71-power8-build
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
+  - name: .jscore .common !.decimal
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: causally_consistent_jscore_txns_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: mongosTest
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
-  - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough_gen
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version !.csrs
+  - name: snmp
+  - name: .ssl
 
 - name: enterprise-rhel-72-s390x-inmem
   display_name: Enterprise RHEL 7.2 s390x (inMemory) DEBUG
@@ -13885,95 +11617,32 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel72-zseries-build
-  - name: aggregation
-  - name: aggregation_auth
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation .common
+  - name: .auth !.multiversion
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: concurrency
-    distros:
-    - rhel72-zseries-build
-  - name: concurrency_replication
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
     distros:
     - rhel72-zseries-build
   - name: concurrency_replication_causal_consistency
     distros:
     - rhel72-zseries-build
-  - name: concurrency_replication_multi_stmt_txn
-    distros:
-    - rhel72-zseries-build
-  - name: concurrency_sharded_replication
-    distros:
-    - rhel72-zseries-build
-  - name: concurrency_sharded_replication_with_balancer
+  - name: .integration !.audit
     distros:
     - rhel72-zseries-build
-  - name: concurrency_simultaneous
-    distros:
-    - rhel72-zseries-build
-  - name: concurrency_simultaneous_replication
-    distros:
-    - rhel72-zseries-build
-  - name: failpoints
-  - name: failpoints_auth
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-    distros:
-    - rhel72-zseries-build
-  - name: integration_tests_sharded
-    distros:
-    - rhel72-zseries-build
-  - name: integration_tests_standalone
-    distros:
-    - rhel72-zseries-build
-  - name: jsCore
-  - name: jsCore_auth
-  - name: jsCore_compatibility
+  - name: .jscore .common !.decimal
   - name: jsCore_op_query
-  - name: jsCore_txns
-  - name: causally_consistent_jscore_txns_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: mongosTest
-  - name: noPassthrough_gen
-  - name: noPassthroughWithMongod_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
+  - name: .logical_session_cache .one_sec
+  - name: .read_write_concern
   - name: replica_sets
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .common
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
-  - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough_gen
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.mixed_version !.csrs
+  - name: snmp
+  - name: .ssl
 
 
 ###########################################
@@ -14006,157 +11675,42 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation
+  - name: .auth
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_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
-  - name: change_streams_secondary_reads
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_secondary_reads_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_secondary_reads_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  - name: concurrency_replication
-  - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
+  - name: .causally_consistent !.wo_snapshot
+  - name: .change_streams
+  - name: .misc_js
+  - name: .concurrency !.ubsan !.no_txns
   - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
+  - name: .encrypt
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
   - name: initial_sync_fuzzer_gen
-  - name: integration_tests_replset
-  - name: integration_tests_sharded
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .integration !.standalone !.audit
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - 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_gen
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
-  - name: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
-  - name: multiversion_auth
+  - name: .logical_session_cache
+  - name: .multi_shard .common
   - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-  - name: replica_sets_initsync_static_jscore_passthrough
+  - name: .read_write_concern
   - name: replica_sets_multi_oplog_txns_gen
   - name: replica_sets_multi_oplog_txns_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-  - 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_gen
-  - name: retryable_writes_jscore_stepdown_passthrough
+  - name: .replica_sets !.multi_oplog
+  - name: .retry
+  - name: .read_only
+  - name: .rollbackfuzzer
   - name: sasl
+  - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot
+  - name: .sharding .common !.csrs
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
-  - name: watchdog_inmemory
-  - name: watchdog_wiredtiger
-  - name: write_concern_majority_passthrough
-  - name: secondary_reads_passthrough_gen
+  - name: .watchdog
+  - name: .stitch
+  - name: .updatefuzzer
 
 - name: ubuntu1804-asan
   display_name: ~ ASAN SSL Ubuntu 18.04
@@ -14181,25 +11735,9 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
+  - name: .aggfuzzer .common
   - name: free_monitoring
-  - name: aggregation_multiversion_fuzzer_gen
-  - name: aggregation_wildcard_fuzzer_gen
-  - name: jstestfuzz_gen
-  - name: jstestfuzz_concurrent_gen
-  - name: jstestfuzz_concurrent_replication_gen
-  - name: jstestfuzz_concurrent_replication_session_gen
-  - name: jstestfuzz_concurrent_sharded_gen
-  - name: jstestfuzz_concurrent_sharded_causal_consistency_gen
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_concurrent_sharded_session_gen
-  - name: jstestfuzz_interrupt_gen
-  - name: jstestfuzz_interrupt_replication_gen
-  - name: jstestfuzz_replication_gen
-  - name: jstestfuzz_replication_session_gen
-  - name: jstestfuzz_sharded_gen
-  - name: jstestfuzz_sharded_causal_consistency_gen
-  - name: jstestfuzz_sharded_continuous_stepdown_gen
-  - name: jstestfuzz_sharded_session_gen
+  - name: .jstestfuzz !.initsync
 
 - name: ubuntu1804-debug-ubsan
   display_name: ~ UBSAN Enterprise Ubuntu 18.04 DEBUG
@@ -14226,148 +11764,41 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: rollback_fuzzer_gen
-  - name: rollback_fuzzer_clean_shutdowns_gen
-  - name: rollback_fuzzer_unclean_shutdowns_gen
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_mongos_passthrough
-  - name: aggregation_one_shard_sharded_collections
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation
+  - name: .auth
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_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
-  - name: change_streams_secondary_reads
-  - name: change_streams_sharded_collections_passthrough
-  - name: change_streams_whole_db_passthrough
-  - name: change_streams_whole_db_mongos_passthrough
-  - name: change_streams_whole_db_secondary_reads_passthrough
-  - name: change_streams_whole_db_sharded_collections_passthrough
-  - name: change_streams_whole_cluster_passthrough
-  - name: change_streams_whole_cluster_mongos_passthrough
-  - name: change_streams_whole_cluster_secondary_reads_passthrough
-  - name: change_streams_whole_cluster_sharded_collections_passthrough
-  - name: concurrency
-  # TODO: SERVER-35964 revert the addition of UBSAN concurrency_replication suites.
-  - name: concurrency_replication_ubsan
-  - name: concurrency_replication_causal_consistency_ubsan
-  - name: concurrency_replication_multi_stmt_txn_ubsan
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_sharded_causal_consistency_gen
-  - name: concurrency_sharded_causal_consistency_and_balancer
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn
-  - name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn
-  - name: concurrency_sharded_multi_stmt_txn_with_balancer
-  - name: concurrency_sharded_multi_stmt_txn_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns
-  - name: concurrency_sharded_with_stepdowns_and_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
+  - name: .causally_consistent !.wo_snapshot
+  - name: .change_streams
+  - name: .misc_js
+  - name: .concurrency !.no_txns !.repl
   - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
+  - name: .encrypt
   - name: free_monitoring
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
   - name: initial_sync_fuzzer_gen
-  - name: integration_tests_replset
-  - name: integration_tests_sharded
-  - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .integration !.audit
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - 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: mongosTest
-  - name: multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough_gen
-  - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
-  - name: multiversion_auth
+  - name: .logical_session_cache .one_sec
+  - name: .multi_shard .common
   - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-  - name: replica_sets_initsync_static_jscore_passthrough
+  - name: .read_write_concern
   - name: replica_sets_multi_oplog_txns_gen
   - name: replica_sets_multi_oplog_txns_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
-  - name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
-  - name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
-  - 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_gen
-  - name: retryable_writes_jscore_stepdown_passthrough
+  - name: .replica_sets !.multi_oplog
+  - name: .retry
+  - name: .rollbackfuzzer
+  - name: .read_only
   - name: sasl
+  - name: secondary_reads_passthrough_gen
   - name: session_jscore_passthrough
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot
+  - name: .sharding .common !.csrs
   - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: stitch_support_lib_build_and_test
-  - name: stitch_support_lib_build_and_archive
-  - name: tool
-  - name: update_fuzzer_gen
-  - name: update_fuzzer_replication_gen
-  - name: write_concern_majority_passthrough
-  - name: secondary_reads_passthrough_gen
+  - name: .stitch
+  - name: .updatefuzzer
 
 - name: ubuntu1804-debug-aubsan-lite
   display_name: "! {A,UB}SAN Enterprise SSL Ubuntu 18.04 DEBUG"
@@ -14392,13 +11823,11 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
+  - name: causally_consistent_jscore_txns_passthrough
   - name: jsCore
   - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_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: .logical_session_cache .one_sec
   - name: watchdog_wiredtiger
 
 - name: ubuntu1804-debug-aubsan-async
@@ -14429,101 +11858,30 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: aggregation
-  - name: aggregation_ese
-  - name: aggregation_ese_gcm
-  - name: aggregation_auth
-  - name: aggregation_facet_unwind_passthrough
-  - name: aggregation_read_concern_majority_passthrough
-  - name: aggregation_sharded_collections_passthrough
+  - name: .aggregation !.no_async
+  - name: .auth
   - name: audit
-  - name: auth_gen
-  - name: auth_audit_gen
-  - name: bulk_gle_passthrough
-  - name: causally_consistent_jscore_passthrough_gen
-  - name: causally_consistent_jscore_passthrough_auth_gen
-  - name: sharded_causally_consistent_jscore_passthrough_gen
-  - name: concurrency
-  - name: concurrency_replication
+  - name: .causally_consistent !.wo_snapshot
+  - name: .misc_js
+  - name: .concurrency .common
   - name: concurrency_replication_causal_consistency
-  - name: concurrency_replication_multi_stmt_txn
-  - name: concurrency_sharded_replication
-  - name: concurrency_sharded_replication_with_balancer
-  - name: concurrency_simultaneous
-  - name: concurrency_simultaneous_replication
   - name: disk_wiredtiger
-  - name: ese
-  - name: failpoints
-  - name: failpoints_auth
-  - name: fle
-  - name: gle_auth
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_write_cmd
-  - name: integration_tests_replset
-  - name: integration_tests_sharded
-  - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_ese
-  - name: jsCore_ese_gcm
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_decimal
+  - name: .encrypt
+  - name: .integration !.audit
+  - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns
   - name: jsCore_txns_multi_oplog_entries
-  - name: causally_consistent_jscore_txns_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: mongosTest
-  - name: multiversion_auth
+  - name: .logical_session_cache .one_sec
   - name: multiversion
-  - name: noPassthroughWithMongod_gen
-  - name: noPassthrough_gen
-  - name: parallel_gen
-  - name: parallel_compatibility
-  - name: read_concern_linearizable_passthrough
-  - name: read_concern_majority_passthrough_gen
-  - name: read_only
-  - name: read_only_sharded
-  - name: replica_sets
-  - name: replica_sets_ese_gen
-  - name: replica_sets_ese_gcm_gen
-  - name: replica_sets_auth_gen
-  - name: replica_sets_jscore_passthrough
-  - name: replica_sets_initsync_jscore_passthrough
-  - name: replica_sets_initsync_static_jscore_passthrough
-  - name: replica_sets_kill_secondaries_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
+  - name: .read_write_concern
+  - name: .replica_sets .san
+  - name: .read_only
   - name: sasl
-  - name: sharded_causally_consistent_jscore_txns_passthrough_gen
-  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_jscore_txns
-  - name: sharded_jscore_txns_sharded_collections
-  - name: sharding_gen
-  - name: sharding_ese_gen
-  - name: sharding_ese_gcm_gen
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_last_stable_mongos_and_mixed_shards_gen
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_op_query_passthrough
-  - name: sharding_jscore_passthrough_wire_ops_gen
-  - name: sharding_op_query_gen
-  - name: slow1_gen
-  - name: serial_run
-  - name: snmp
-  - name: ssl_gen
-  - name: sslSpecial_gen
-  - name: tool
-  - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough_gen
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.csrs
+  - name: snmp
 
 - name: enterprise-ubuntu-dynamic-1604-64-bit
   display_name: "* Shared Library Enterprise Ubuntu 16.04"
author	David Bradford <david.bradford@mongodb.com>	2019-05-20 15:23:07 -0400
committer	David Bradford <david.bradford@mongodb.com>	2019-05-20 15:23:07 -0400
commit	542d00d1a3a23d608f0a6e991684ea010cbc62ae (patch)
tree	07799f3819afb0df9af0ba53fbafb4bb608bf93d /etc
parent	793e28d328de4bfff72414becf6ccc7c291cecb3 (diff)
download	mongo-542d00d1a3a23d608f0a6e991684ea010cbc62ae.tar.gz