SERVER-56164 clean up system_perf.yml and perf.yml spacing

1 files changed, 1204 insertions, 1204 deletions

diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index 939bda8cf63..daf697b6e65 100755
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -373,1240 +373,1240 @@ functions:
 
 
 tasks:
-###
-# Same in every DSI project
-- name: schedule_global_auto_tasks
-  priority: 5
-  commands:
-    - func: f_schedule_tasks
-      vars:
-        tasks: all_tasks
-- name: schedule_variant_auto_tasks
-  priority: 5
-  commands:
-    - func: f_schedule_tasks
-      vars:
-        tasks: variant_tasks
-- name: schedule_patch_auto_tasks
-  priority: 5
-  commands:
-    - func: f_schedule_tasks
-      vars:
-        tasks: patch_tasks
-- name: smoke_test
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: short
-- name: smoke_test_ssl
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: short
-        mongodb_setup: replica-ssl
-        infrastructure_provisioning: replica
-- name: smoke_test_standalone_auth
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: short
-        mongodb_setup: standalone-auth
-        infrastructure_provisioning: single
-- name: smoke_test_replset_auth
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: short
-        mongodb_setup: replica-auth
-        infrastructure_provisioning: replica
-- name: smoke_test_shard_lite_auth
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: short
-        mongodb_setup: shard-lite-auth
-        infrastructure_provisioning: shard-lite
-- name: dsi_integ_test_run_command_simple
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: run_command_simple
-###
+  ###
+  # Same in every DSI project
+  - name: schedule_global_auto_tasks
+    priority: 5
+    commands:
+      - func: f_schedule_tasks
+        vars:
+          tasks: all_tasks
+  - name: schedule_variant_auto_tasks
+    priority: 5
+    commands:
+      - func: f_schedule_tasks
+        vars:
+          tasks: variant_tasks
+  - name: schedule_patch_auto_tasks
+    priority: 5
+    commands:
+      - func: f_schedule_tasks
+        vars:
+          tasks: patch_tasks
+  - name: smoke_test
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: short
+  - name: smoke_test_ssl
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: short
+          mongodb_setup: replica-ssl
+          infrastructure_provisioning: replica
+  - name: smoke_test_standalone_auth
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: short
+          mongodb_setup: standalone-auth
+          infrastructure_provisioning: single
+  - name: smoke_test_replset_auth
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: short
+          mongodb_setup: replica-auth
+          infrastructure_provisioning: replica
+  - name: smoke_test_shard_lite_auth
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: short
+          mongodb_setup: shard-lite-auth
+          infrastructure_provisioning: shard-lite
+  - name: dsi_integ_test_run_command_simple
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: run_command_simple
+  ###
 
-- name: compile
-  commands:
-    - command: manifest.load
-    - command: git.get_project
-      params:
-        directory: src
-        revisions:
-          enterprise: ${enterprise_rev}
-          mongo-tools: ${mongo-tools_rev}
-    - func: "compile mongodb"
+  - name: compile
+    commands:
+      - command: manifest.load
+      - command: git.get_project
+        params:
+          directory: src
+          revisions:
+            enterprise: ${enterprise_rev}
+            mongo-tools: ${mongo-tools_rev}
+      - func: "compile mongodb"
+
+  - name: renew_ssl_cert
+    commands:
+      - command: git.get_project
+        params:
+          directory: *src_dir
+          revisions:
+            dsi: ${dsi_rev}
+      # Run the script to generate ssl cert files
+      - command: shell.exec
+        params:
+          script: AWS_ACCESS_KEY_ID=${terraform_key} AWS_SECRET_ACCESS_KEY=${terraform_secret} ./src/dsi/run-dsi generate_ssl_cert
+      # Upload files for further DSI usage
+      - command: s3.put
+        params:
+          aws_key: ${aws_key}
+          aws_secret: ${aws_secret}
+          local_file: member.pem
+          # path to the remote file is intended to be static
+          remote_file: dsi/ssl/member.pem
+          bucket: mciuploads
+          # the visibility has to be public for consumption by DSI
+          permissions: public-read
+          content_type: text/plain
+          display_name: member.pem
+      - command: s3.put
+        params:
+          aws_key: ${aws_key}
+          aws_secret: ${aws_secret}
+          local_file: root.crt
+          # path to the remote file is intended to be static
+          remote_file: dsi/ssl/root.crt
+          bucket: mciuploads
+          # the visibility has to be public for consumption by DSI
+          permissions: public-read
+          content_type: text/plain
+          display_name: root.crt
 
-- name: renew_ssl_cert
-  commands:
-    - command: git.get_project
-      params:
-        directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-    # Run the script to generate ssl cert files
-    - command: shell.exec
-      params:
-        script: AWS_ACCESS_KEY_ID=${terraform_key} AWS_SECRET_ACCESS_KEY=${terraform_secret} ./src/dsi/run-dsi generate_ssl_cert
-    # Upload files for further DSI usage
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: member.pem
-        # path to the remote file is intended to be static
-        remote_file: dsi/ssl/member.pem
-        bucket: mciuploads
-        # the visibility has to be public for consumption by DSI
-        permissions: public-read
-        content_type: text/plain
-        display_name: member.pem
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: root.crt
-        # path to the remote file is intended to be static
-        remote_file: dsi/ssl/root.crt
-        bucket: mciuploads
-        # the visibility has to be public for consumption by DSI
-        permissions: public-read
-        content_type: text/plain
-        display_name: root.crt
-
-- name: linkbench
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "linkbench"
-
-- name: linkbench_stepdowns
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "linkbench_stepdowns"
-
-- name: linkbench_rolling_restarts
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "linkbench_rolling_restarts"
-
-- name: linkbench_non_retryable_writes_stepdowns
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "linkbench_non_retryable_writes_stepdowns"
-
-- name: linkbench_non_retryable_writes_rolling_restarts
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "linkbench_non_retryable_writes_rolling_restarts"
-
-- name: linkbench2
-  priority: 5
-  exec_timeout_secs: 43200 # 12 hours
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "linkbench2"
-        additional_tfvars: "tags: {expire-on-delta: 12}"
-
-- name: tpcc
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "tpcc"
-
-- name: industry_benchmarks
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb"
-
-- name: ycsb_60GB
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb-60GB"
-
-- name: industry_benchmarks_secondary_reads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb-secondary-reads"
-
-- name: industry_benchmarks_wmajority
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb-wmajority"
-
-- name: industry_benchmarks_stepdowns
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb_stepdowns"
-
-- name: industry_benchmarks_rolling_restarts
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb_rolling_restarts"
-
-- name: industry_benchmarks_non_retryable_writes_stepdowns
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb_non_retryable_writes_stepdowns"
-
-- name: industry_benchmarks_non_retryable_writes_rolling_restarts
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "ycsb_non_retryable_writes_rolling_restarts"
-
-- name: crud_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "crud_workloads"
-
-- name: crud_workloads_majority
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "crud_workloads_majority"
-
-- name: cursor_manager
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "cursor_manager"
-
-- name: mixed_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "mixed_workloads"
-
-- name: mixed_workloads_genny_stepdowns
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "mixed_workloads_genny_stepdowns"
-
-- name: mixed_workloads_genny_rolling_restarts
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "mixed_workloads_genny_rolling_restarts"
-
-- name: misc_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "misc_workloads"
-
-
-- name: map_reduce_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "map_reduce_workloads"
-
-- name: genny_canaries
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "genny_canaries"
-
-- name: retryable_writes_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "retryable_writes"
-
-- name: snapshot_reads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "snapshot_reads"
-
-- name: secondary_reads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "secondary_reads"
-
-- name: bestbuy_agg
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "bestbuy_agg"
-
-- name: bestbuy_agg_merge_same_db
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "bestbuy_agg_merge_same_db"
-
-- name: bestbuy_agg_merge_different_db
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "bestbuy_agg_merge_different_db"
-
-- name: bestbuy_agg_merge_target_hashed
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "bestbuy_agg_merge_target_hashed"
-
-- name: bestbuy_agg_merge_wordcount
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "bestbuy_agg_merge_wordcount"
-
-- name: bestbuy_query
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "bestbuy_query"
-
-- name: non_sharded_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "non_sharded"
-
-- name: mongos_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "mongos"
-
-- name: mongos_large_catalog_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "mongos_large_catalog"
-
-- name: move_chunk_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "move_chunk"
-
-- name: move_chunk_waiting_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "move_chunk_waiting"
-
-- name: move_chunk_large_chunk_map_workloads
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "move_chunk_large_chunk_map"
-
-- name: refine_shard_key_transaction_stress
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "refine_shard_key_transaction_stress"
-
-- name: secondary_performance
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        # Unfortunately the dash/underscore style is different for mongodb_setup and test_control
-        test_control: "secondary_performance"
-        mongodb_setup: "secondary-performance"
-
-- name: initialsync
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "initialsync"
-
-- name: initialsync-logkeeper-short
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "initialsync-logkeeper"
-        mongodb_setup: "initialsync-logkeeper-short"
-        # Logkeeper dataset with FCV set to 4.4
-        mongodb_dataset: "https://s3-us-west-2.amazonaws.com/dsi-donot-remove/InitialSyncLogKeeper/logkeeper-slice-data-mongodb-4.4.tgz"
-
-- name: initialsync-logkeeper
-  priority: 5
-  exec_timeout_secs: 216000 # 2.5 days
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "initialsync-logkeeper"
-
-# The following two initial sync logkeeper automation tasks are only used in the commented-out
-# "Linux ReplSet Initial Sync LogKeeper Snapshot Update" variant below and are only intended to be
-# run in patch builds to update FCV for logkeeper datasets.
-- name: initialsync-logkeeper-short-s3-update
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "initialsync-logkeeper-short-s3-update"
-        mongodb_setup: "initialsync-logkeeper-short-s3-update"
-        # Update this to Logkeeper dataset with FCV set to latest after each LTS release.
-        mongodb_dataset: "https://s3-us-west-2.amazonaws.com/dsi-donot-remove/InitialSyncLogKeeper/logkeeper-slice-data-mongodb-4.4.tgz"
-
-- name: initialsync-logkeeper-snapshot-update
-  priority: 5
-  exec_timeout_secs: 216000 # 2.5 days
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "initialsync-logkeeper-snapshot-update"
-
-- name: initialsync-large
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "initialsync-large"
-
-- name: change_streams_throughput
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "change_streams_throughput"
-
-- name: change_streams_latency
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "change_streams_latency"
-
-- name: change_streams_multi_mongos
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "change_streams_multi_mongos"
-
-- name: sb_large_scale
-  priority: 5
-  exec_timeout_secs: 43200 # 12 hours
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "sb_large_scale"
-        additional_tfvars: "tags: {expire-on-delta: 12}"
-
-- name: sb_timeseries
-  priority: 5
-  commands:
-    - func: f_run_dsi_workload
-      vars:
-        test_control: "sb_timeseries"
+  - name: linkbench
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "linkbench"
+
+  - name: linkbench_stepdowns
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "linkbench_stepdowns"
+
+  - name: linkbench_rolling_restarts
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "linkbench_rolling_restarts"
+
+  - name: linkbench_non_retryable_writes_stepdowns
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "linkbench_non_retryable_writes_stepdowns"
+
+  - name: linkbench_non_retryable_writes_rolling_restarts
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "linkbench_non_retryable_writes_rolling_restarts"
+
+  - name: linkbench2
+    priority: 5
+    exec_timeout_secs: 43200 # 12 hours
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "linkbench2"
+          additional_tfvars: "tags: {expire-on-delta: 12}"
+
+  - name: tpcc
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "tpcc"
+
+  - name: industry_benchmarks
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb"
+
+  - name: ycsb_60GB
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb-60GB"
+
+  - name: industry_benchmarks_secondary_reads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb-secondary-reads"
+
+  - name: industry_benchmarks_wmajority
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb-wmajority"
+
+  - name: industry_benchmarks_stepdowns
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb_stepdowns"
+
+  - name: industry_benchmarks_rolling_restarts
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb_rolling_restarts"
+
+  - name: industry_benchmarks_non_retryable_writes_stepdowns
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb_non_retryable_writes_stepdowns"
+
+  - name: industry_benchmarks_non_retryable_writes_rolling_restarts
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "ycsb_non_retryable_writes_rolling_restarts"
+
+  - name: crud_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "crud_workloads"
+
+  - name: crud_workloads_majority
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "crud_workloads_majority"
+
+  - name: cursor_manager
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "cursor_manager"
+
+  - name: mixed_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "mixed_workloads"
+
+  - name: mixed_workloads_genny_stepdowns
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "mixed_workloads_genny_stepdowns"
+
+  - name: mixed_workloads_genny_rolling_restarts
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "mixed_workloads_genny_rolling_restarts"
+
+  - name: misc_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "misc_workloads"
+
+
+  - name: map_reduce_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "map_reduce_workloads"
+
+  - name: genny_canaries
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "genny_canaries"
+
+  - name: retryable_writes_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "retryable_writes"
+
+  - name: snapshot_reads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "snapshot_reads"
+
+  - name: secondary_reads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "secondary_reads"
+
+  - name: bestbuy_agg
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "bestbuy_agg"
+
+  - name: bestbuy_agg_merge_same_db
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "bestbuy_agg_merge_same_db"
+
+  - name: bestbuy_agg_merge_different_db
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "bestbuy_agg_merge_different_db"
+
+  - name: bestbuy_agg_merge_target_hashed
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "bestbuy_agg_merge_target_hashed"
+
+  - name: bestbuy_agg_merge_wordcount
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "bestbuy_agg_merge_wordcount"
+
+  - name: bestbuy_query
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "bestbuy_query"
+
+  - name: non_sharded_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "non_sharded"
+
+  - name: mongos_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "mongos"
+
+  - name: mongos_large_catalog_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "mongos_large_catalog"
+
+  - name: move_chunk_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "move_chunk"
+
+  - name: move_chunk_waiting_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "move_chunk_waiting"
+
+  - name: move_chunk_large_chunk_map_workloads
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "move_chunk_large_chunk_map"
+
+  - name: refine_shard_key_transaction_stress
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "refine_shard_key_transaction_stress"
+
+  - name: secondary_performance
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          # Unfortunately the dash/underscore style is different for mongodb_setup and test_control
+          test_control: "secondary_performance"
+          mongodb_setup: "secondary-performance"
+
+  - name: initialsync
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "initialsync"
+
+  - name: initialsync-logkeeper-short
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "initialsync-logkeeper"
+          mongodb_setup: "initialsync-logkeeper-short"
+          # Logkeeper dataset with FCV set to 4.4
+          mongodb_dataset: "https://s3-us-west-2.amazonaws.com/dsi-donot-remove/InitialSyncLogKeeper/logkeeper-slice-data-mongodb-4.4.tgz"
+
+  - name: initialsync-logkeeper
+    priority: 5
+    exec_timeout_secs: 216000 # 2.5 days
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "initialsync-logkeeper"
+
+  # The following two initial sync logkeeper automation tasks are only used in the commented-out
+  # "Linux ReplSet Initial Sync LogKeeper Snapshot Update" variant below and are only intended to be
+  # run in patch builds to update FCV for logkeeper datasets.
+  - name: initialsync-logkeeper-short-s3-update
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "initialsync-logkeeper-short-s3-update"
+          mongodb_setup: "initialsync-logkeeper-short-s3-update"
+          # Update this to Logkeeper dataset with FCV set to latest after each LTS release.
+          mongodb_dataset: "https://s3-us-west-2.amazonaws.com/dsi-donot-remove/InitialSyncLogKeeper/logkeeper-slice-data-mongodb-4.4.tgz"
+
+  - name: initialsync-logkeeper-snapshot-update
+    priority: 5
+    exec_timeout_secs: 216000 # 2.5 days
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "initialsync-logkeeper-snapshot-update"
+
+  - name: initialsync-large
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "initialsync-large"
+
+  - name: change_streams_throughput
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "change_streams_throughput"
+
+  - name: change_streams_latency
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "change_streams_latency"
+
+  - name: change_streams_multi_mongos
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "change_streams_multi_mongos"
+
+  - name: sb_large_scale
+    priority: 5
+    exec_timeout_secs: 43200 # 12 hours
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "sb_large_scale"
+          additional_tfvars: "tags: {expire-on-delta: 12}"
+
+  - name: sb_timeseries
+    priority: 5
+    commands:
+      - func: f_run_dsi_workload
+        vars:
+          test_control: "sb_timeseries"
 
 
 buildvariants:
-- name: task_generation
-  display_name: Task Generation
-  modules: *modules
-  expansions:
-    platform: linux
-    project_dir: dsi
-  run_on:
+  - name: task_generation
+    display_name: Task Generation
+    modules: *modules
+    expansions:
+      platform: linux
+      project_dir: dsi
+    run_on:
       - amazon2-build
-  tasks:
-    - name: schedule_global_auto_tasks
-
-- &compile-amazon2
-  name: compile-amazon2
-  display_name: Compile
-  modules: *modules
-  batchtime: 2880 # 48 hours
-  expansions: &compile-expansions
-    platform: linux
-    project_dir: &project_dir dsi
-    tooltags: ""
-    use_scons_cache: true
-    compile_flags: >-
-      --ssl
-      --separate-debug
-      MONGO_DISTMOD=amazon2
-      -j$(grep -c ^processor /proc/cpuinfo)
-      --release
-      --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
-      install-mongocryptd
-  run_on:
+    tasks:
+      - name: schedule_global_auto_tasks
+
+  - &compile-amazon2
+    name: compile-amazon2
+    display_name: Compile
+    modules: *modules
+    batchtime: 2880 # 48 hours
+    expansions: &compile-expansions
+      platform: linux
+      project_dir: &project_dir dsi
+      tooltags: ""
+      use_scons_cache: true
+      compile_flags: >-
+        --ssl
+        --separate-debug
+        MONGO_DISTMOD=amazon2
+        -j$(grep -c ^processor /proc/cpuinfo)
+        --release
+        --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+        install-mongocryptd
+    run_on:
       - "amazon2-build"
-  tasks:
-    - name: compile
-
-- name: linux-standalone
-  display_name: Linux Standalone
-  batchtime: 2880  # 48 hours
-  modules: *modules
-  expansions:
-    mongodb_setup: standalone
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    tasks:
+      - name: compile
+
+  - name: linux-standalone
+    display_name: Linux Standalone
+    batchtime: 2880  # 48 hours
+    modules: *modules
+    expansions:
+      mongodb_setup: standalone
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks: &standalonetasks
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: dsi_integ_test_run_command_simple
-    - name: smoke_test
-    - name: industry_benchmarks
-    - name: ycsb_60GB
-    - name: crud_workloads
-    - name: genny_canaries
-    - name: cursor_manager
-    - name: mixed_workloads
-    - name: misc_workloads
-    - name: map_reduce_workloads
-    - name: non_sharded_workloads
-    - name: bestbuy_agg
-    - name: bestbuy_agg_merge_different_db
-    - name: bestbuy_agg_merge_same_db
-    - name: bestbuy_agg_merge_wordcount
-    - name: bestbuy_query
-
-- name: compile-rhel70
-  display_name: Compile for Atlas-like
-  modules: *modules
-  batchtime: 2880 # 48 hours
-  expansions:
-    <<: *compile-expansions
-    compile_flags: >-
-      --ssl
-      --separate-debug
-      MONGO_DISTMOD=rhel70
-      -j$(grep -c ^processor /proc/cpuinfo)
-      --release
-      --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
-    compile-variant: -rhel70
-  run_on:
-  - rhel70-large
-  tasks:
-  - name: compile
+    depends_on: *_compile_amazon2
+    tasks: &standalonetasks
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: dsi_integ_test_run_command_simple
+      - name: smoke_test
+      - name: industry_benchmarks
+      - name: ycsb_60GB
+      - name: crud_workloads
+      - name: genny_canaries
+      - name: cursor_manager
+      - name: mixed_workloads
+      - name: misc_workloads
+      - name: map_reduce_workloads
+      - name: non_sharded_workloads
+      - name: bestbuy_agg
+      - name: bestbuy_agg_merge_different_db
+      - name: bestbuy_agg_merge_same_db
+      - name: bestbuy_agg_merge_wordcount
+      - name: bestbuy_query
+
+  - name: compile-rhel70
+    display_name: Compile for Atlas-like
+    modules: *modules
+    batchtime: 2880 # 48 hours
+    expansions:
+      <<: *compile-expansions
+      compile_flags: >-
+        --ssl
+        --separate-debug
+        MONGO_DISTMOD=rhel70
+        -j$(grep -c ^processor /proc/cpuinfo)
+        --release
+        --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+      compile-variant: -rhel70
+    run_on:
+      - rhel70-large
+    tasks:
+      - name: compile
 
-- name: linux-1-node-replSet
-  display_name: Linux 1-Node ReplSet
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+  - name: linux-1-node-replSet
+    display_name: Linux 1-Node ReplSet
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: single-replica
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks: &1nodetasks
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: ycsb_60GB
-    - name: crud_workloads
-    - name: mixed_workloads
-    - name: misc_workloads
-    - name: map_reduce_workloads
-    - name: smoke_test
-    - name: retryable_writes_workloads
-    - name: non_sharded_workloads
-    - name: bestbuy_agg
-    - name: bestbuy_agg_merge_different_db
-    - name: bestbuy_agg_merge_same_db
-    - name: bestbuy_agg_merge_wordcount
-    - name: bestbuy_query
-    - name: change_streams_throughput
-    - name: change_streams_latency
-    - name: snapshot_reads
-    - name: linkbench
-    - name: linkbench2
-    - name: tpcc
-    - name: industry_benchmarks_wmajority
-    - name: sb_large_scale
-    - name: sb_timeseries
-
-- name: linux-standalone-audit
-  display_name: Linux Standalone Audit
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: standalone-audit
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks: &1nodetasks
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: ycsb_60GB
+      - name: crud_workloads
+      - name: mixed_workloads
+      - name: misc_workloads
+      - name: map_reduce_workloads
+      - name: smoke_test
+      - name: retryable_writes_workloads
+      - name: non_sharded_workloads
+      - name: bestbuy_agg
+      - name: bestbuy_agg_merge_different_db
+      - name: bestbuy_agg_merge_same_db
+      - name: bestbuy_agg_merge_wordcount
+      - name: bestbuy_query
+      - name: change_streams_throughput
+      - name: change_streams_latency
+      - name: snapshot_reads
+      - name: linkbench
+      - name: linkbench2
+      - name: tpcc
+      - name: industry_benchmarks_wmajority
+      - name: sb_large_scale
+      - name: sb_timeseries
+
+  - name: linux-standalone-audit
+    display_name: Linux Standalone Audit
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: standalone-audit
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: crud_workloads
-    - name: smoke_test
-
-- name: linux-1-node-replSet-fle
-  display_name: Linux 1-Node ReplSet FLE
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica-fle
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    fle: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: crud_workloads
+      - name: smoke_test
+
+  - name: linux-1-node-replSet-fle
+    display_name: Linux 1-Node ReplSet FLE
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: single-replica-fle
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      fle: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: linkbench
-
-- name: linux-1-node-replSet-cwrwc
-  display_name: Linux 1-Node ReplSet CWRWC
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica-cwrwc
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: linkbench
+
+  - name: linux-1-node-replSet-cwrwc
+    display_name: Linux 1-Node ReplSet CWRWC
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: single-replica-cwrwc
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: linkbench
-
-- name: linux-1-node-replSet-ese-cbc
-  display_name: Linux 1-Node ReplSet ESE CBC
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica-ese-cbc
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: linkbench
+
+  - name: linux-1-node-replSet-ese-cbc
+    display_name: Linux 1-Node ReplSet ESE CBC
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: single-replica-ese-cbc
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: smoke_test
-    - name: ycsb_60GB
-
-- name: linux-1-node-replSet-ese-gcm
-  display_name: Linux 1-Node ReplSet ESE GCM
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica-ese-gcm
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: smoke_test
+      - name: ycsb_60GB
+
+  - name: linux-1-node-replSet-ese-gcm
+    display_name: Linux 1-Node ReplSet ESE GCM
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: single-replica-ese-gcm
+      infrastructure_provisioning: single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: smoke_test
-    - name: ycsb_60GB
-
-- name: linux-1-node-15gbwtcache
-  display_name: Linux 1-Node ReplSet 15 GB WiredTiger Cache
-  batchtime: 2880  # 48 hours
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica-15gbwtcache
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: smoke_test
+      - name: ycsb_60GB
+
+  - name: linux-1-node-15gbwtcache
+    display_name: Linux 1-Node ReplSet 15 GB WiredTiger Cache
+    batchtime: 2880  # 48 hours
+    modules: *modules
+    expansions:
+      mongodb_setup: single-replica-15gbwtcache
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-single"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: smoke_test
-
-- name: linux-3-node-1dayhistory-15gbwtcache
-  display_name: Linux 3-Node ReplSet 1 Day History 15 GB WiredTiger Cache
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-1dayhistory-15gbwtcache
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
-    - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: crud_workloads
-    - name: crud_workloads_majority
-    - name: smoke_test
-
-- name: linux-3-shard
-  display_name: Linux 3-Shard Cluster
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: shard
-    infrastructure_provisioning: shard
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: smoke_test
+
+  - name: linux-3-node-1dayhistory-15gbwtcache
+    display_name: Linux 3-Node ReplSet 1 Day History 15 GB WiredTiger Cache
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-1dayhistory-15gbwtcache
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
+      - "rhel70-perf-replset"
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: crud_workloads
+      - name: crud_workloads_majority
+      - name: smoke_test
+
+  - name: linux-3-shard
+    display_name: Linux 3-Shard Cluster
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: shard
+      infrastructure_provisioning: shard
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-shard"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: crud_workloads
-    - name: mixed_workloads
-    - name: misc_workloads
-    - name: map_reduce_workloads
-    - name: smoke_test
-    - name: industry_benchmarks_wmajority
-    - name: mongos_workloads
-    - name: mongos_large_catalog_workloads
-    - name: change_streams_throughput
-    - name: change_streams_latency
-    - name: change_streams_multi_mongos
-
-- name: linux-shard-lite-audit
-  display_name: Linux Shard Lite Cluster Audit
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: shard-lite-audit
-    infrastructure_provisioning: shard-lite
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: crud_workloads
+      - name: mixed_workloads
+      - name: misc_workloads
+      - name: map_reduce_workloads
+      - name: smoke_test
+      - name: industry_benchmarks_wmajority
+      - name: mongos_workloads
+      - name: mongos_large_catalog_workloads
+      - name: change_streams_throughput
+      - name: change_streams_latency
+      - name: change_streams_multi_mongos
+
+  - name: linux-shard-lite-audit
+    display_name: Linux Shard Lite Cluster Audit
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: shard-lite-audit
+      infrastructure_provisioning: shard-lite
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
+      - "rhel70-perf-shard-lite"
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: industry_benchmarks
+
+  - name: linux-shard-lite
+    display_name: Linux Shard Lite Cluster
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: shard-lite
+      infrastructure_provisioning: shard-lite
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-shard-lite"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: industry_benchmarks
-
-- name: linux-shard-lite
-  display_name: Linux Shard Lite Cluster
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: shard-lite
-    infrastructure_provisioning: shard-lite
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks: &shardlitetasks
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: bestbuy_agg
+      - name: bestbuy_agg_merge_different_db
+      - name: bestbuy_agg_merge_same_db
+      - name: bestbuy_agg_merge_target_hashed
+      - name: bestbuy_agg_merge_wordcount
+      - name: bestbuy_query
+      - name: change_streams_latency
+      - name: change_streams_throughput
+      - name: industry_benchmarks
+      - name: industry_benchmarks_wmajority
+      - name: linkbench
+      - name: mixed_workloads
+      - name: mongos_workloads
+      - name: mongos_large_catalog_workloads
+      - name: move_chunk_large_chunk_map_workloads
+      - name: move_chunk_workloads
+      - name: move_chunk_waiting_workloads
+      - name: retryable_writes_workloads
+      - name: smoke_test
+
+  - name: linux-shard-lite-cwrwc
+    display_name: Linux Shard Lite Cluster CWRWC
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: shard-lite-cwrwc
+      infrastructure_provisioning: shard-lite
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-shard-lite"
-  depends_on: *_compile_amazon2
-  tasks: &shardlitetasks
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: bestbuy_agg
-    - name: bestbuy_agg_merge_different_db
-    - name: bestbuy_agg_merge_same_db
-    - name: bestbuy_agg_merge_target_hashed
-    - name: bestbuy_agg_merge_wordcount
-    - name: bestbuy_query
-    - name: change_streams_latency
-    - name: change_streams_throughput
-    - name: industry_benchmarks
-    - name: industry_benchmarks_wmajority
-    - name: linkbench
-    - name: mixed_workloads
-    - name: mongos_workloads
-    - name: mongos_large_catalog_workloads
-    - name: move_chunk_large_chunk_map_workloads
-    - name: move_chunk_workloads
-    - name: move_chunk_waiting_workloads
-    - name: retryable_writes_workloads
-    - name: smoke_test
-
-- name: linux-shard-lite-cwrwc
-  display_name: Linux Shard Lite Cluster CWRWC
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: shard-lite-cwrwc
-    infrastructure_provisioning: shard-lite
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: linkbench
+
+  - name: linux-shard-lite-all-feature-flags
+    display_name: Linux Shard Lite (all feature flags)
+    batchtime: 10080  # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: shard-lite-all-feature-flags
+      infrastructure_provisioning: shard-lite
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-shard-lite"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: linkbench
-
-- name: linux-shard-lite-all-feature-flags
-  display_name: Linux Shard Lite (all feature flags)
-  batchtime: 10080  # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: shard-lite-all-feature-flags
-    infrastructure_provisioning: shard-lite
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
-    - "rhel70-perf-shard-lite"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-
-- name: linux-shard-single
-  display_name: Linux Shard Single
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: shard-single
-    infrastructure_provisioning: shard-single
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+
+  - name: linux-shard-single
+    display_name: Linux Shard Single
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: shard-single
+      infrastructure_provisioning: shard-single
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-shard-lite"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-
-- name: linux-3-node-replSet
-  display_name: Linux 3-Node ReplSet
-  batchtime: 2880  # 48 hours
-  modules: *modules
-  expansions:
-    mongodb_setup: replica
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+
+  - name: linux-3-node-replSet
+    display_name: Linux 3-Node ReplSet
+    batchtime: 2880  # 48 hours
+    modules: *modules
+    expansions:
+      mongodb_setup: replica
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks: &3nodetasks
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: ycsb_60GB
-    - name: industry_benchmarks_secondary_reads
-    - name: crud_workloads
-    - name: crud_workloads_majority
-    - name: mixed_workloads
-    - name: misc_workloads
-    - name: map_reduce_workloads
-    - name: refine_shard_key_transaction_stress
-    - name: smoke_test
-    - name: retryable_writes_workloads
-    - name: industry_benchmarks_wmajority
-    - name: secondary_performance # Uses a special 2 node mongodb setup
-    - name: non_sharded_workloads
-    - name: bestbuy_agg
-    - name: bestbuy_agg_merge_different_db
-    - name: bestbuy_agg_merge_same_db
-    - name: bestbuy_agg_merge_wordcount
-    - name: bestbuy_query
-    - name: change_streams_throughput
-    - name: change_streams_latency
-    - name: snapshot_reads
-    - name: secondary_reads
-    - name: tpcc
-    - name: linkbench
-    - name: linkbench2
-    - name: sb_large_scale
-    - name: sb_timeseries
-
-- name: linux-3-node-replSet-last-continuous-fcv
-  display_name: Linux 3-Node ReplSet (Last Continuous FCV)
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-last-continuous-fcv
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks: &3nodetasks
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: ycsb_60GB
+      - name: industry_benchmarks_secondary_reads
+      - name: crud_workloads
+      - name: crud_workloads_majority
+      - name: mixed_workloads
+      - name: misc_workloads
+      - name: map_reduce_workloads
+      - name: refine_shard_key_transaction_stress
+      - name: smoke_test
+      - name: retryable_writes_workloads
+      - name: industry_benchmarks_wmajority
+      - name: secondary_performance # Uses a special 2 node mongodb setup
+      - name: non_sharded_workloads
+      - name: bestbuy_agg
+      - name: bestbuy_agg_merge_different_db
+      - name: bestbuy_agg_merge_same_db
+      - name: bestbuy_agg_merge_wordcount
+      - name: bestbuy_query
+      - name: change_streams_throughput
+      - name: change_streams_latency
+      - name: snapshot_reads
+      - name: secondary_reads
+      - name: tpcc
+      - name: linkbench
+      - name: linkbench2
+      - name: sb_large_scale
+      - name: sb_timeseries
+
+  - name: linux-3-node-replSet-last-continuous-fcv
+    display_name: Linux 3-Node ReplSet (Last Continuous FCV)
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-last-continuous-fcv
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks: *3nodetasks
-
-- name: linux-3-node-replSet-last-lts-fcv
-  display_name: Linux 3-Node ReplSet (Last LTS FCV)
-  batchtime: 10080  # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-last-lts-fcv
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks: *3nodetasks
+
+  - name: linux-3-node-replSet-last-lts-fcv
+    display_name: Linux 3-Node ReplSet (Last LTS FCV)
+    batchtime: 10080  # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-last-lts-fcv
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks: *3nodetasks
-
-# Note that the "disabled-feature-flags" part of the name is kept to avoid breaking
-# history even though the display name is "all feature flags"
-- name: linux-3-node-replSet-disabled-feature-flags
-  display_name: Linux 3-Node ReplSet (all feature flags)
-  batchtime: 10080  # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-all-feature-flags
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks: *3nodetasks
+
+  # Note that the "disabled-feature-flags" part of the name is kept to avoid breaking
+  # history even though the display name is "all feature flags"
+  - name: linux-3-node-replSet-disabled-feature-flags
+    display_name: Linux 3-Node ReplSet (all feature flags)
+    batchtime: 10080  # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-all-feature-flags
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks: *3nodetasks
-
-- name: linux-3-node-replSet-noflowcontrol
-  display_name: Linux 3-Node ReplSet (Flow Control off)
-  batchtime: 10080  # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-noflowcontrol
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks: *3nodetasks
+
+  - name: linux-3-node-replSet-noflowcontrol
+    display_name: Linux 3-Node ReplSet (Flow Control off)
+    batchtime: 10080  # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-noflowcontrol
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: industry_benchmarks_secondary_reads
-    - name: crud_workloads
-    - name: crud_workloads_majority
-    - name: mixed_workloads
-    - name: smoke_test
-    - name: industry_benchmarks_wmajority
-    - name: change_streams_throughput
-    - name: change_streams_latency
-    - name: tpcc
-    - name: linkbench
-    - name: linkbench2
-
-- name: linux-3-node-replSet-ssl
-  display_name: Linux 3-Node ReplSet (SSL)
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-ssl
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: industry_benchmarks_secondary_reads
+      - name: crud_workloads
+      - name: crud_workloads_majority
+      - name: mixed_workloads
+      - name: smoke_test
+      - name: industry_benchmarks_wmajority
+      - name: change_streams_throughput
+      - name: change_streams_latency
+      - name: tpcc
+      - name: linkbench
+      - name: linkbench2
+
+  - name: linux-3-node-replSet-ssl
+    display_name: Linux 3-Node ReplSet (SSL)
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-ssl
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: mixed_workloads
-
-- name: linux-3-node-replSet-maintenance-events
-  display_name: Linux 3-Node ReplSet (Maintenance Events)
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-maintenance-events
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: mixed_workloads
+
+  - name: linux-3-node-replSet-maintenance-events
+    display_name: Linux 3-Node ReplSet (Maintenance Events)
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-maintenance-events
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks_stepdowns
-    - name: industry_benchmarks_rolling_restarts
-    - name: industry_benchmarks_non_retryable_writes_stepdowns
-    - name: industry_benchmarks_non_retryable_writes_rolling_restarts
-    - name: linkbench_stepdowns
-    - name: linkbench_rolling_restarts
-    - name: linkbench_non_retryable_writes_stepdowns
-    - name: linkbench_non_retryable_writes_rolling_restarts
-    - name: mixed_workloads_genny_stepdowns
-    - name: mixed_workloads_genny_rolling_restarts
-
-- name: linux-3-node-replSet-initialsync
-  display_name: Linux 3-Node ReplSet Initial Sync
-  batchtime: 2880  # 48 hours
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-2node
-    infrastructure_provisioning: replica
-    platform: linux
-    authentication: disabled
-    storageEngine: wiredTiger
-    project_dir: *project_dir
-  depends_on: *_compile_amazon2
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks_stepdowns
+      - name: industry_benchmarks_rolling_restarts
+      - name: industry_benchmarks_non_retryable_writes_stepdowns
+      - name: industry_benchmarks_non_retryable_writes_rolling_restarts
+      - name: linkbench_stepdowns
+      - name: linkbench_rolling_restarts
+      - name: linkbench_non_retryable_writes_stepdowns
+      - name: linkbench_non_retryable_writes_rolling_restarts
+      - name: mixed_workloads_genny_stepdowns
+      - name: mixed_workloads_genny_rolling_restarts
+
+  - name: linux-3-node-replSet-initialsync
+    display_name: Linux 3-Node ReplSet Initial Sync
+    batchtime: 2880  # 48 hours
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-2node
+      infrastructure_provisioning: replica
+      platform: linux
+      authentication: disabled
+      storageEngine: wiredTiger
+      project_dir: *project_dir
+    depends_on: *_compile_amazon2
+    run_on:
       - "rhel70-perf-replset"
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: initialsync
-    - name: initialsync-logkeeper-short
-    - name: initialsync-large
-
-- name: linux-replSet-initialsync-logkeeper
-  display_name: Linux ReplSet Initial Sync LogKeeper
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: initialsync-logkeeper
-    infrastructure_provisioning: initialsync-logkeeper
-    # EBS logkeeper snapshot with FCV set to 4.4
-    snapshotId: snap-0dba360e743e27ea0
-    platform: linux
-    authentication: disabled
-    storageEngine: wiredTiger
-    project_dir: *project_dir
-  run_on:
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: initialsync
+      - name: initialsync-logkeeper-short
+      - name: initialsync-large
+
+  - name: linux-replSet-initialsync-logkeeper
+    display_name: Linux ReplSet Initial Sync LogKeeper
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: initialsync-logkeeper
+      infrastructure_provisioning: initialsync-logkeeper
+      # EBS logkeeper snapshot with FCV set to 4.4
+      snapshotId: snap-0dba360e743e27ea0
+      platform: linux
+      authentication: disabled
+      storageEngine: wiredTiger
+      project_dir: *project_dir
+    run_on:
       - "rhel70-perf-initialsync-logkeeper"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: initialsync-logkeeper
-
-# Uncomment this to run logkeeper FCV updates automatically. This is only intended to be run in
-# patch builds.
-#- name: linux-replSet-initialsync-logkeeper-snapshot-update
-#  display_name: Linux ReplSet Initial Sync LogKeeper Snapshot Update
-#  batchtime: 10080 # 7 days
-#  modules: *modules
-#  expansions:
-#    mongodb_setup: initialsync-logkeeper
-#    infrastructure_provisioning: initialsync-logkeeper-snapshot-update
-#    # Update this to latest snapshot after each LTS release.
-#    snapshotId: snap-0dba360e743e27ea0
-#    platform: linux
-#    authentication: disabled
-#    storageEngine: wiredTiger
-#    project_dir: *project_dir
-#  run_on:
-#    - "rhel70-perf-initialsync-logkeeper"
-#  depends_on: *_compile_amazon2
-#  tasks:
-#    - name: schedule_patch_auto_tasks
-#    - name: schedule_variant_auto_tasks
-#    - name: initialsync-logkeeper-snapshot-update
-#    - name: initialsync-logkeeper-short-s3-update
-
-- name: linux-replSet-audit
-  display_name: Linux 3-Node ReplSet Audit
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-audit
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: initialsync-logkeeper
+
+  # Uncomment this to run logkeeper FCV updates automatically. This is only intended to be run in
+  # patch builds.
+  #- name: linux-replSet-initialsync-logkeeper-snapshot-update
+  #  display_name: Linux ReplSet Initial Sync LogKeeper Snapshot Update
+  #  batchtime: 10080 # 7 days
+  #  modules: *modules
+  #  expansions:
+  #    mongodb_setup: initialsync-logkeeper
+  #    infrastructure_provisioning: initialsync-logkeeper-snapshot-update
+  #    # Update this to latest snapshot after each LTS release.
+  #    snapshotId: snap-0dba360e743e27ea0
+  #    platform: linux
+  #    authentication: disabled
+  #    storageEngine: wiredTiger
+  #    project_dir: *project_dir
+  #  run_on:
+  #    - "rhel70-perf-initialsync-logkeeper"
+  #  depends_on: *_compile_amazon2
+  #  tasks:
+  #    - name: schedule_patch_auto_tasks
+  #    - name: schedule_variant_auto_tasks
+  #    - name: initialsync-logkeeper-snapshot-update
+  #    - name: initialsync-logkeeper-short-s3-update
+
+  - name: linux-replSet-audit
+    display_name: Linux 3-Node ReplSet Audit
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-audit
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-
-- name: linux-replSet-auth-delay
-  display_name: Linux 3-Node ReplSet (Auth Delay)
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica-auth-cluster-delay
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+
+  - name: linux-replSet-auth-delay
+    display_name: Linux 3-Node ReplSet (Auth Delay)
+    batchtime: 10080 # 7 days
+    modules: *modules
+    expansions:
+      mongodb_setup: replica-auth-cluster-delay
+      infrastructure_provisioning: replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+    run_on:
       - "rhel70-perf-replset"
-  depends_on: *_compile_amazon2
-  tasks:
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-
-- name: atlas-like-M60
-  display_name: M60-Like 3-Node ReplSet
-  batchtime: 5760  # 4 days
-  modules: *modules
-  expansions:
-    mongodb_setup: atlas-like-replica
-    infrastructure_provisioning: M60-like-replica
-    platform: linux
-    project_dir: *project_dir
-    authentication: enabled
-    storageEngine: wiredTiger
-    compile-variant: -rhel70
-  run_on:
+    depends_on: *_compile_amazon2
+    tasks:
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+
+  - name: atlas-like-M60
+    display_name: M60-Like 3-Node ReplSet
+    batchtime: 5760  # 4 days
+    modules: *modules
+    expansions:
+      mongodb_setup: atlas-like-replica
+      infrastructure_provisioning: M60-like-replica
+      platform: linux
+      project_dir: *project_dir
+      authentication: enabled
+      storageEngine: wiredTiger
+      compile-variant: -rhel70
+    run_on:
       - "rhel70-perf-M60-like"
-  depends_on: *_compile_rhel70
-  tasks:  # Cannot use *3nodetasks because secondary_performance uses a special mongodb setup.
-    - name: schedule_patch_auto_tasks
-    - name: schedule_variant_auto_tasks
-    - name: industry_benchmarks
-    - name: ycsb_60GB
-    - name: industry_benchmarks_secondary_reads
-    - name: crud_workloads
-    - name: crud_workloads_majority
-    - name: mixed_workloads
-    - name: misc_workloads
-    - name: map_reduce_workloads
-    - name: smoke_test
-    - name: retryable_writes_workloads
-    - name: industry_benchmarks_wmajority
-    - name: non_sharded_workloads
-    - name: bestbuy_agg
-    - name: bestbuy_agg_merge_different_db
-    - name: bestbuy_agg_merge_same_db
-    - name: bestbuy_agg_merge_wordcount
-    - name: bestbuy_query
-    - name: change_streams_throughput
-    - name: change_streams_latency
-    - name: snapshot_reads
-    - name: secondary_reads
-    - name: linkbench
-
-- name: renew-ssl-cert
-  display_name: Renew SSL Cert
-  batchtime: 10080 # 7 days
-  modules: *modules
-  run_on:  # Certbot with route53 plugin is installed on RHEL80
-    - "rhel80-small"
-  tasks:
-    - name: renew_ssl_cert
+    depends_on: *_compile_rhel70
+    tasks:  # Cannot use *3nodetasks because secondary_performance uses a special mongodb setup.
+      - name: schedule_patch_auto_tasks
+      - name: schedule_variant_auto_tasks
+      - name: industry_benchmarks
+      - name: ycsb_60GB
+      - name: industry_benchmarks_secondary_reads
+      - name: crud_workloads
+      - name: crud_workloads_majority
+      - name: mixed_workloads
+      - name: misc_workloads
+      - name: map_reduce_workloads
+      - name: smoke_test
+      - name: retryable_writes_workloads
+      - name: industry_benchmarks_wmajority
+      - name: non_sharded_workloads
+      - name: bestbuy_agg
+      - name: bestbuy_agg_merge_different_db
+      - name: bestbuy_agg_merge_same_db
+      - name: bestbuy_agg_merge_wordcount
+      - name: bestbuy_query
+      - name: change_streams_throughput
+      - name: change_streams_latency
+      - name: snapshot_reads
+      - name: secondary_reads
+      - name: linkbench
+
+  - name: renew-ssl-cert
+    display_name: Renew SSL Cert
+    batchtime: 10080 # 7 days
+    modules: *modules
+    run_on:  # Certbot with route53 plugin is installed on RHEL80
+      - "rhel80-small"
+    tasks:
+      - name: renew_ssl_cert