SERVER-38116: Dynamically generate fuzzer test tasks

(cherry picked from commit 18452b94f497e4f25493477ee45e759d449871e9)

1 files changed, 570 insertions, 536 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 75c4bcb68d7..c617455bbec 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -108,6 +108,8 @@ variables:
       <<: *jepsen_config_vars
 
 - &jstestfuzz_config_vars
+  num_files: 15
+  num_tasks: 10
   resmoke_args: --help # resmoke_args needs to be overridden to specify one of the jstestfuzz suites
   should_shuffle: false
   continue_on_failure: false
@@ -117,21 +119,13 @@ variables:
   # Note that timeout_secs is different from exec_timeout_secs, which applies to a task and times out regardless of whether output has been written to stdout.
   timeout_secs: 1800
 
-- &run_jstestfuzz_tests
-  func: "run tests"
-  vars:
-    <<: *jstestfuzz_config_vars
-
 # Used for tests that invoke 'resmoke.py --suites=jstestfuzz*'.
 - &jstestfuzz_template
   name: jstestfuzz_template
   exec_timeout_secs: 14400 # Time out the task if it runs for more than 4 hours.
-  depends_on:
-  - name: compile
+  depends_on: []
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
 
 # Templates used by powercycle
 - &powercycle_remote_credentials
@@ -489,12 +483,12 @@ variables:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
@@ -1764,6 +1758,47 @@ functions:
             exit $(cat jepsen_system_failure_${task_name}_${execution})
           fi
 
+  "generate fuzzer tasks":
+    - *git_get_project
+
+    - command: expansions.write
+      params:
+        file: src/expansions.yml
+
+    - command: shell.exec
+      params:
+        working_dir: src
+        script: |
+          set -o errexit
+          set -o verbose
+
+          ${activate_virtualenv}
+          $python -m pip install git+https://github.com/evergreen-ci/shrub.py
+          $python buildscripts/evergreen_gen_fuzzer_tests.py --expansion-file expansions.yml
+
+    - command: archive.targz_pack
+      params:
+        target: generate_tasks_config.tgz
+        source_dir: src/generated_resmoke_config
+        include:
+          - "*"
+
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: generate_tasks_config.tgz
+        remote_file: ${project}/${build_variant}/${revision}/generate_tasks/${task_id}-${execution}.tgz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: ${content_type|application/gzip}
+        display_name: Generated Task Config - Execution ${execution}
+
+    - command: generate.tasks
+      params:
+        files:
+          - src/generated_resmoke_config/${name}.json
+
   "run jstestfuzz":
     - command: shell.exec
       params:
@@ -4740,280 +4775,278 @@ tasks:
 
 ## jstestfuzz standalone update generational fuzzer ##
 - <<: *jstestfuzz_template
-  name: update_fuzzer
+  name: update_fuzzer_gen
   commands:
-  - func: "do setup"
-  - func: "do multiversion setup"
-  - func: "run jstestfuzz"
-    vars:
-      npm_command: update-fuzzer
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
-      task_path_suffix: /data/multiversion
+      num_files: 5
+      num_tasks: 10
+      npm_command: update-fuzzer
       resmoke_args: --suites=generational_fuzzer
+      name: update_fuzzer
+      task_path_suffix: "/data/multiversion"
 
 ## jstestfuzz replication update generational fuzzer ##
 - <<: *jstestfuzz_template
-  name: update_fuzzer_replication
+  name: update_fuzzer_replication_gen
   commands:
-  - func: "do setup"
-  - func: "do multiversion setup"
-  - func: "run jstestfuzz"
-    vars:
-      npm_command: update-fuzzer
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
-      task_path_suffix: /data/multiversion
+      num_files: 5
+      num_tasks: 10
+      npm_command: update-fuzzer
       resmoke_args: --suites=generational_fuzzer_replication
+      name: update_fuzzer_replication
+      task_path_suffix: "/data/multiversion"
 
 ## rollback generational fuzzer ##
 - <<: *jstestfuzz_template
-  name: rollback_fuzzer
+  name: rollback_fuzzer_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles 15
-      npm_command: rollback-fuzzer
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: 3
+      num_tasks: 5
+      npm_command: rollback-fuzzer
       resmoke_args: --suites=rollback_fuzzer
+      name: rollback_fuzzer
 
 ## rollback generational fuzzer with clean shutdowns ##
 - <<: *jstestfuzz_template
-  name: rollback_fuzzer_clean_shutdowns
+  name: rollback_fuzzer_clean_shutdowns_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles 4 --numLinesPerFile 300 --maxLinesBetweenEvents 50
-      npm_command: rollback-fuzzer
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: 1
+      num_tasks: 4
+      jstestfuzz_vars: --numLinesPerFile 300 --maxLinesBetweenEvents 50
+      npm_command: rollback-fuzzer
       resmoke_args: --suites=rollback_fuzzer_clean_shutdowns
+      name: rollback_fuzzer_clean_shutdowns
 
 ## rollback generational fuzzer with unclean shutdowns ##
 - <<: *jstestfuzz_template
-  name: rollback_fuzzer_unclean_shutdowns
+  name: rollback_fuzzer_unclean_shutdowns_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles 2 --numLinesPerFile 300 --maxLinesBetweenEvents 50
-      npm_command: rollback-fuzzer
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: 1
+      num_tasks: 4
+      jstestfuzz_vars: --numLinesPerFile 300 --maxLinesBetweenEvents 50
+      npm_command: rollback-fuzzer
       resmoke_args: --suites=rollback_fuzzer_unclean_shutdowns
+      name: rollback_fuzzer_unclean_shutdowns
 
 ## jstestfuzz ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz
+  name: jstestfuzz_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz --storageEngine=wiredTiger
+      npm_command: jstestfuzz
+      name: jstestfuzz
 
 ## jstestfuzz concurrent ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent
+  name: jstestfuzz_concurrent_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles ${jstestfuzz_num_generated_files|75}
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 15
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent
 
 ## jstestfuzz concurrent replica set ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent_replication
+  name: jstestfuzz_concurrent_replication_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles ${jstestfuzz_num_generated_files|75}
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 15
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_replication --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent_replication
 
 ## jstestfuzz concurrent replica set with logical session ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent_replication_session
+  name: jstestfuzz_concurrent_replication_session_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles ${jstestfuzz_num_generated_files|75}
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 15
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_replication_session --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent_replication_session
 
 ## jstestfuzz concurrent sharded cluster ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent_sharded
+  name: jstestfuzz_concurrent_sharded_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles ${jstestfuzz_num_generated_files|75}
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 15
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent_sharded
 
 ## jstestfuzz concurrent sharded cluster causal consistency ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent_sharded_causal_consistency
+  name: jstestfuzz_concurrent_sharded_causal_consistency_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles ${jstestfuzz_num_generated_files|75}
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 15
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded_causal_consistency --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent_sharded_causal_consistency
 
 ## jstestfuzz concurrent sharded cluster continuous stepdown ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent_sharded_continuous_stepdown
+  name: jstestfuzz_concurrent_sharded_continuous_stepdown_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles 25
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 2
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded_continuous_stepdown --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent_sharded_continuous_stepdown
 
 ## jstestfuzz concurrent sharded cluster with logical session ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_concurrent_sharded_session
+  name: jstestfuzz_concurrent_sharded_session_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles ${jstestfuzz_num_generated_files|75}
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: ${jstestfuzz_concurrent_num_files|10}
+      num_tasks: 15
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded_session --storageEngine=wiredTiger --numClientsPerFixture=10
+      name: jstestfuzz_concurrent_sharded_session
 
 # jstestfuzz interrupt #
 - <<: *jstestfuzz_template
-  name: jstestfuzz_interrupt
+  name: jstestfuzz_interrupt_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_interrupt --storageEngine=wiredTiger
+      name: jstestfuzz_interrupt
 
 # jstestfuzz interrupt #
 - <<: *jstestfuzz_template
-  name: jstestfuzz_interrupt_replication
+  name: jstestfuzz_interrupt_replication_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_interrupt_replication --storageEngine=wiredTiger
+      name: jstestfuzz_interrupt_replication
 
 ## jstestfuzz replica set ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_replication
+  name: jstestfuzz_replication_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_replication --storageEngine=wiredTiger
+      name: jstestfuzz_replication
 
 ## jstestfuzz initial sync replica set ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_replication_initsync
+  name: jstestfuzz_replication_initsync_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles 75
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: 8
+      num_tasks: 10
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_replication_initsync --storageEngine=wiredTiger
+      name: jstestfuzz_replication_initsync
 
 ## jstestfuzz replica set with logical session ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_replication_session
+  name: jstestfuzz_replication_session_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_replication_session --storageEngine=wiredTiger
+      name: jstestfuzz_replication_session
 
 ## jstestfuzz sharded cluster ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_sharded
+  name: jstestfuzz_sharded_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded --storageEngine=wiredTiger
+      name: jstestfuzz_sharded
 
 ## jstestfuzz sharded cluster causal consistency ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_sharded_causal_consistency
+  name: jstestfuzz_sharded_causal_consistency_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded_causal_consistency --storageEngine=wiredTiger
+      name: jstestfuzz_sharded_causal_consistency
 
 ## jstestfuzz sharded cluster continuous stepdown ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_sharded_continuous_stepdown
+  name: jstestfuzz_sharded_continuous_stepdown_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-    vars:
-      jstestfuzz_vars: --numGeneratedFiles 50
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      num_files: 5
+      num_tasks: 10
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded_continuous_stepdown --storageEngine=wiredTiger
+      name: jstestfuzz_sharded_continuous_stepdown
 
 ## jstestfuzz sharded cluster with logical session ##
 - <<: *jstestfuzz_template
-  name: jstestfuzz_sharded_session
+  name: jstestfuzz_sharded_session_gen
   commands:
-  - func: "do setup"
-  - func: "run jstestfuzz"
-  - <<: *run_jstestfuzz_tests
+  - func: "generate fuzzer tasks"
     vars:
       <<: *jstestfuzz_config_vars
+      jstestfuzz_vars: --jsTestsDir ../jstests
       resmoke_args: --suites=jstestfuzz_sharded_session --storageEngine=wiredTiger
+      name: jstestfuzz_sharded_session
 
 ## integration test suites ##
 
@@ -8374,12 +8407,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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_auth
   - name: multiversion
@@ -8678,10 +8711,10 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_sharded
+  - name: jstestfuzz_gen
+  - name: jstestfuzz_concurrent_gen
+  - name: jstestfuzz_concurrent_sharded_gen
+  - name: jstestfuzz_sharded_gen
   - name: mongosTest
   - name: noPassthrough
   - name: noPassthroughWithMongod
@@ -8743,12 +8776,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -8841,12 +8874,12 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_decimal
   - name: jsCore_txns
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -8921,12 +8954,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -9016,12 +9049,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -9106,12 +9139,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: noPassthroughWithMongod
@@ -9228,12 +9261,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: noPassthroughWithMongod
@@ -9332,12 +9365,12 @@ buildvariants:
   - name: jsCore_op_query
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -9421,12 +9454,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -9506,12 +9539,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -9600,12 +9633,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -9688,12 +9721,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -9802,9 +9835,9 @@ buildvariants:
   - name: mongosTest
   - name: noPassthrough
   - name: noPassthroughWithMongod
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - name: rollback_fuzzer_gen
+  - name: rollback_fuzzer_clean_shutdowns_gen
+  - name: rollback_fuzzer_unclean_shutdowns_gen
   - name: bulk_gle_passthrough
   - name: parallel
   - name: parallel_compatibility
@@ -9955,12 +9988,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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: replica_sets_auth_0
   - name: replica_sets_auth_1
   - name: replica_sets_auth_2
@@ -10274,12 +10307,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -10359,22 +10392,22 @@ buildvariants:
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -10412,8 +10445,8 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
   - name: push
     distros:
@@ -10521,20 +10554,20 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_session
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -10548,9 +10581,9 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: replica_sets_kill_secondaries_jscore_passthrough
   - name: retryable_writes_jscore_passthrough
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - name: rollback_fuzzer_gen
+  - name: rollback_fuzzer_clean_shutdowns_gen
+  - name: rollback_fuzzer_unclean_shutdowns_gen
   - name: serial_run
   - name: session_jscore_passthrough
   - name: sharded_collections_jscore_passthrough
@@ -10629,12 +10662,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -10680,12 +10713,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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: replica_sets_auth
   - name: sasl
   - name: ssl
@@ -11147,6 +11180,7 @@ buildvariants:
     tooltags: "-tags 'ssl sasl'"
     build_mongoreplay: true
     jstestfuzz_num_generated_files: 40
+    jstestfuzz_concurrent_num_files: 10
   display_tasks:
   - *dbtest
   - *replica_sets_auth
@@ -11172,9 +11206,9 @@ buildvariants:
   - name: burn_in_tests
     distros:
     - rhel62-large
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - name: rollback_fuzzer_gen
+  - name: rollback_fuzzer_clean_shutdowns_gen
+  - name: rollback_fuzzer_unclean_shutdowns_gen
   - name: aggregation
   - name: aggregation_ese
   - name: aggregation_auth
@@ -11245,23 +11279,23 @@ buildvariants:
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_initsync
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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
   - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
@@ -11701,8 +11735,8 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
     distros:
     - rhel62-large
@@ -11747,9 +11781,9 @@ buildvariants:
   - name: compile_all_run_unittests_TG
     distros:
     - rhel62-large
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - name: rollback_fuzzer_gen
+  - name: rollback_fuzzer_clean_shutdowns_gen
+  - name: rollback_fuzzer_unclean_shutdowns_gen
   - name: aggregation
   - name: aggregation_ese
   - name: aggregation_auth
@@ -11796,23 +11830,23 @@ buildvariants:
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsonSchema
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_initsync
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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: multiversion
   - name: multiversion_multistorage_engine
   - name: noPassthroughWithMongod
@@ -12226,8 +12260,8 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
     distros:
     - rhel62-large
@@ -12265,9 +12299,9 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - name: rollback_fuzzer_gen
+  - name: rollback_fuzzer_clean_shutdowns_gen
+  - name: rollback_fuzzer_unclean_shutdowns_gen
   - name: aggregation
   - name: aggregation_ese
   - name: aggregation_auth
@@ -12369,8 +12403,8 @@ buildvariants:
   - name: snmp
   - name: ssl
   - name: sslSpecial
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough
 
@@ -12418,12 +12452,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -12533,12 +12567,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
@@ -12638,12 +12672,12 @@ buildvariants:
   - name: jsCore_decimal
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -12761,12 +12795,12 @@ buildvariants:
   - name: jsCore_op_query
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -12873,12 +12907,12 @@ buildvariants:
   - name: jsCore_op_query
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13097,12 +13131,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13177,12 +13211,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13286,12 +13320,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13374,12 +13408,12 @@ buildvariants:
   - name: jsCore_op_query
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13470,12 +13504,12 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -13553,12 +13587,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13623,12 +13657,12 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -13708,12 +13742,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -13781,12 +13815,12 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
@@ -13907,22 +13941,22 @@ buildvariants:
   - name: jsCore_op_query
   - name: jsCore_txns
   - name: causally_consistent_jscore_txns_passthrough
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_session
-  - name: jstestfuzz_sharded_causal_consistency
+  - 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
   - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
@@ -13948,7 +13982,7 @@ buildvariants:
   - name: retryable_writes_jscore_passthrough
   - name: retryable_writes_jscore_stepdown_passthrough
   - name: rlp
-  - name: rollback_fuzzer
+  - name: rollback_fuzzer_gen
   - name: sasl
   - name: session_jscore_passthrough
   - name: sharded_collections_jscore_passthrough
@@ -13967,8 +14001,8 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough
     distros:
@@ -14047,8 +14081,8 @@ buildvariants:
   - name: jsCore_mobile
   - name: jsCore_op_query
   - name: jsonSchema
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
+  - name: jstestfuzz_gen
+  - name: jstestfuzz_concurrent_gen
   - name: noPassthrough
   - name: noPassthroughWithMongod
   - name: powercycle_mobile
@@ -14101,8 +14135,8 @@ buildvariants:
   - name: jsCore_mobile
   - name: jsCore_op_query
   - name: jsonSchema
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
+  - name: jstestfuzz_gen
+  - name: jstestfuzz_concurrent_gen
   - name: noPassthrough
   - name: noPassthroughWithMongod
   - name: serial_run
@@ -14180,8 +14214,8 @@ buildvariants:
   - name: jsCore_mobile
   - name: jsCore_op_query
   - name: jsonSchema
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
+  - name: jstestfuzz_gen
+  - name: jstestfuzz_concurrent_gen
   - name: noPassthrough
   - name: noPassthroughWithMongod
   - name: serial_run
@@ -14236,12 +14270,12 @@ buildvariants:
   - name: jsCore_auth
   - name: jsCore_op_query
   - name: jsCore_compatibility
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -14257,7 +14291,7 @@ buildvariants:
   - name: replica_sets
   - name: replica_sets_auth
   - name: replica_sets_jscore_passthrough
-  - name: rollback_fuzzer
+  - name: rollback_fuzzer_gen
   - name: sharding
   - name: sharding_auth
   - name: sharding_op_query
@@ -14268,8 +14302,8 @@ buildvariants:
   - name: sharding_jscore_op_query_passthrough
   - name: sharding_jscore_passthrough_wire_ops
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
 
 - name: enterprise-rhel-71-ppc64le-inmem
   display_name: Enterprise RHEL 7.1 PPC64LE (inMemory) DEBUG
@@ -14487,9 +14521,9 @@ buildvariants:
   - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - name: rollback_fuzzer_gen
+  - name: rollback_fuzzer_clean_shutdowns_gen
+  - name: rollback_fuzzer_unclean_shutdowns_gen
   - name: aggregation
   - name: aggregation_ese
   - name: aggregation_auth
@@ -14606,8 +14640,8 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough
 
@@ -14636,22 +14670,22 @@ buildvariants:
   tasks:
   - name: compile_all_run_unittests_TG
   - name: free_monitoring
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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: ubuntu1604-debug-ubsan
   display_name: ~ UBSAN Enterprise Ubuntu 16.04 DEBUG
@@ -14682,9 +14716,9 @@ buildvariants:
   - name: compile_all_run_unittests_TG
   - name: aggregation
   - name: aggregation_ese
-  - name: rollback_fuzzer
-  - name: rollback_fuzzer_clean_shutdowns
-  - name: rollback_fuzzer_unclean_shutdowns
+  - 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
@@ -14792,8 +14826,8 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
   - name: write_concern_majority_passthrough
   - name: secondary_reads_passthrough
 
@@ -15035,23 +15069,23 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_decimal
   - name: jsCore_op_query
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_initsync
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -15080,7 +15114,7 @@ buildvariants:
     distros:
     - rhel62-large
   - name: rlp
-  - name: rollback_fuzzer
+  - name: rollback_fuzzer_gen
   - name: serial_run
   - name: sharded_collections_jscore_passthrough
   - name: sharding
@@ -15092,8 +15126,8 @@ buildvariants:
   - name: slow1
   - name: snmp
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
 
 - name: enterprise-windows-64-2k8-mmapv1
   display_name: Enterprise Windows 2008R2 MMAPv1
@@ -15172,23 +15206,23 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_decimal
   - name: jsCore_op_query
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_initsync
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -15214,7 +15248,7 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
     distros:
     - windows-64-vs2015-large
-  - name: rollback_fuzzer
+  - name: rollback_fuzzer_gen
   - name: serial_run
   - name: sharded_collections_jscore_passthrough
   - name: sharding
@@ -15226,8 +15260,8 @@ buildvariants:
   - name: slow1
   - name: snmp
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
 
 - name: enterprise-osx-1010-mmapv1
   display_name: Enterprise macOS 10.10 MMAPv1
@@ -15278,23 +15312,23 @@ buildvariants:
   - name: jsCore_compatibility
   - name: jsCore_decimal
   - name: jsCore_op_query
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_replication_session
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_concurrent_sharded_causal_consistency
-  - name: jstestfuzz_concurrent_sharded_continuous_stepdown
-  - name: jstestfuzz_concurrent_sharded_session
-  - name: jstestfuzz_interrupt
-  - name: jstestfuzz_interrupt_replication
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_replication_initsync
-  - name: jstestfuzz_replication_session
-  - name: jstestfuzz_sharded
-  - name: jstestfuzz_sharded_causal_consistency
-  - name: jstestfuzz_sharded_continuous_stepdown
-  - name: jstestfuzz_sharded_session
+  - 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_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
@@ -15310,7 +15344,7 @@ buildvariants:
   - name: replica_sets_initsync_jscore_passthrough
   - name: replica_sets_initsync_static_jscore_passthrough
   - name: replica_sets_jscore_passthrough
-  - name: rollback_fuzzer
+  - name: rollback_fuzzer_gen
   - name: serial_run
   - name: sharded_collections_jscore_passthrough
   - name: sharding_gle_auth_basics_passthrough
@@ -15318,8 +15352,8 @@ buildvariants:
   - name: sharding_jscore_passthrough
   - name: slow1
   - name: tool
-  - name: update_fuzzer
-  - name: update_fuzzer_replication
+  - name: update_fuzzer_gen
+  - name: update_fuzzer_replication_gen
 
 - name: linux-64-duroff-mmapv1
   display_name: Linux (No Journal) MMAPv1
@@ -15365,12 +15399,12 @@ buildvariants:
   - name: jsCore
   - name: jsCore_auth
   - name: jsCore_compatibility
-  - name: jstestfuzz
-  - name: jstestfuzz_concurrent
-  - name: jstestfuzz_concurrent_replication
-  - name: jstestfuzz_concurrent_sharded
-  - name: jstestfuzz_replication
-  - name: jstestfuzz_sharded
+  - 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
   - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough