SERVER-64731: Use version level task generation

(cherry picked from commit c1638c0ae38d4ca3c807af83811bac4fa780f096)

9 files changed, 24 insertions, 113 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index a5adb52ce26..434bb4c7af6 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -54,6 +54,7 @@
 
 include:
 - filename: etc/evergreen_yml_components/definitions.yml
+- filename: etc/evergreen_yml_components/variants/task_generation.yml
 - filename: etc/evergreen_yml_components/variants/sanitizer.yml
 - filename: etc/evergreen_yml_components/variants/in_memory.yml
 
@@ -91,7 +92,6 @@ variables:
   - name: compile_test_and_package_serial_TG
     distros:
     - windows-vsCurrent-large
-  - name: build_variant_gen
   - name: burn_in_tests_gen
   - name: .aggfuzzer .common
   - name: audit
@@ -148,7 +148,6 @@ variables:
   - name: compile_build_tools_next_TG
     distros:
     - rhel70
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: audit
   - name: auth_audit_gen
@@ -238,7 +237,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .aggregation !.encrypt
   - name: .auth !.audit !.multiversion
   - name: .batched_deletes
@@ -318,7 +316,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: aggregation_auth
@@ -389,7 +386,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: test_api_version_compatibility
   - name: .aggfuzzer !.multiversion
   - name: .aggregation !.multiversion
@@ -508,7 +504,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-large
-  - name: build_variant_gen
   # to reduce the overall size of the generated configuration, most of the
   # tasks we would normally include have been disabled. See revert of
   # SERVER-60832
@@ -683,7 +678,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: .aggregation
   - name: audit
@@ -846,7 +840,6 @@ buildvariants:
   - name: compile_build_tools_next_TG
     distros:
     - windows-vsCurrent-xlarge
-  - name: build_variant_gen
   - name: .aggregation !.auth !.encrypt
   - name: aggregation_expression_multiversion_fuzzer_gen
   - name: aggregation_expression_optimization_fuzzer_gen
@@ -925,7 +918,6 @@ buildvariants:
   - name: compile_build_tools_next_TG
     distros:
     - windows-vsCurrent-xlarge
-  - name: build_variant_gen
   - name: burn_in_tests_gen
   - name: audit
   - name: auth_audit_gen
@@ -998,7 +990,6 @@ buildvariants:
   - name: compile_build_tools_next_TG
     distros:
     - windows-vsCurrent-xlarge
-  - name: build_variant_gen
   - name: burn_in_tests_gen
   - name: audit
   - name: auth_audit_gen
@@ -1082,7 +1073,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - windows-vsCurrent-large
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
@@ -1160,7 +1150,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_build_tools_next_TG
-  - name: build_variant_gen
   - name: aggregation
   - name: auth_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -1204,7 +1193,6 @@ buildvariants:
     num_scons_link_jobs_available: 0.99
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: audit
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -1233,7 +1221,6 @@ buildvariants:
     num_scons_link_jobs_available: 0.99
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: audit
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -1260,7 +1247,6 @@ buildvariants:
     num_scons_link_jobs_available: 0.99
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: audit
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -1376,7 +1362,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .lint
   - name: lint_fuzzer_sanity_patch
   - name: test_api_version_compatibility
@@ -1544,7 +1529,6 @@ buildvariants:
   - name: libdeps_graph_linting_TG
     distros:
     - rhel80-large
-  - name: build_variant_gen
   - name: burn_in_tests_gen
   - name: .aggfuzzer
   - name: .aggregation
@@ -1695,7 +1679,6 @@ buildvariants:
     - rhel80-xlarge
   - name: .updatefuzzer
   - name: audit
-  - name: build_variant_gen
   - name: burn_in_tags_gen
   - name: burn_in_tests_gen
   - name: check_feature_flag_tags
@@ -1785,7 +1768,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-large
-  - name: build_variant_gen
   - name: auth_gen
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -1868,7 +1850,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .multiversion_fuzzer
   - name: .multiversion_passthrough
   - name: .random_multiversion_ds
@@ -1894,7 +1875,6 @@ buildvariants:
   # - name: compile_test_and_package_parallel_dbtest_stream_TG
   #   distros:
   #   - rhel80-xlarge
-  - name: build_variant_gen
   - name: .multiversion_fuzzer
   - name: .multiversion_passthrough
   - name: .random_multiversion_ds
@@ -1936,7 +1916,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .multiversion !.future_git_tag_incompatible
   - name: .multiversion_future_git_tag
 
@@ -1995,7 +1974,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: audit
   - name: auth_audit_gen
@@ -2059,7 +2037,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_core_stream_TG
   - name: compile_test_and_package_parallel_unittest_stream_TG
   - name: compile_test_and_package_parallel_dbtest_stream_TG
-  - name: build_variant_gen
   - name: jsCore
   - name: noPassthroughHotBackups_gen
 
@@ -2088,7 +2065,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel70
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: audit
   - name: auth_audit_gen
@@ -2130,7 +2106,6 @@ buildvariants:
   - name: compile_and_archive_dist_test_then_package_TG
     distros:
     - ubuntu1804-build
-  - name: build_variant_gen
   - name: jsCore
   - name: sharding_gen
   - name: replica_sets_gen
@@ -2215,7 +2190,6 @@ buildvariants:
   - name: compile_build_tools_next_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: jsCore
   - name: .read_write_concern !.write !.aggregation
   - name: replica_sets_jscore_passthrough
@@ -2269,7 +2243,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_unittest_stream_TG
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     # TODO (SERVER-58125): Re-enable the timeseries fuzzer for EFT
-  - name: build_variant_gen
   - name: .aggfuzzer .common !.timeseries
   - name: aggregation
   - name: .auth !.multiversion !.audit !.sharding
@@ -2334,7 +2307,6 @@ buildvariants:
   - name: cqf_parallel
   - name: compile_and_archive_dist_test_then_package_TG
   - name: compile_benchmarks
-  - name: build_variant_gen
   - name: .aggregation
   #  - name: .auth
   - name: audit
@@ -2407,7 +2379,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_benchmarks
-  - name: build_variant_gen
   - name: .aggregation
   - name: .auth
   - name: audit
@@ -2484,7 +2455,6 @@ buildvariants:
   - name: cqf_parallel
   - name: compile_and_archive_dist_test_then_package_TG
   - name: compile_benchmarks
-  - name: build_variant_gen
   - name: .aggregation
   - name: .auth
   - name: audit
@@ -2553,7 +2523,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_benchmarks
-  - name: build_variant_gen
   - name: .aggregation
   - name: .auth
   - name: audit
@@ -2629,7 +2598,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: jsCore
   - name: jsCore_txns
   - name: unittest_shell_hang_analyzer_gen
@@ -2662,7 +2630,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_core_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: jsCore
   - name: jsCore_txns
 # Disabling these tests as they are not aware of feature flags.
@@ -2776,7 +2743,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
@@ -2818,7 +2784,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
@@ -2856,7 +2821,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
@@ -2895,7 +2859,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
@@ -2934,7 +2897,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
@@ -2973,7 +2935,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
@@ -3004,7 +2965,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: .aggregation !.no_async
   - name: .sharding .auth
   - name: .sharding .causally_consistent !.wo_snapshot
diff --git a/etc/evergreen_nightly.yml b/etc/evergreen_nightly.yml
index 647de6d9b17..b296f4ec951 100644
--- a/etc/evergreen_nightly.yml
+++ b/etc/evergreen_nightly.yml
@@ -2,6 +2,7 @@
 
 include:
 - filename: etc/evergreen_yml_components/definitions.yml
+- filename: etc/evergreen_yml_components/variants/task_generation.yml
 - filename: etc/evergreen_yml_components/variants/atlas.yml
 - filename: etc/evergreen_yml_components/variants/misc_release.yml
 ### Comment out when using this file for a LTS or Rapid release branch. ###
@@ -44,7 +45,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .aggregation !.encrypt
   - name: .auth !.audit !.multiversion
   - name: .batched_deletes
@@ -118,7 +118,6 @@ buildvariants:
   - name: compile_build_tools_next_TG
     distros:
     - windows-vsCurrent-xlarge
-  - name: build_variant_gen
   - name: burn_in_tests_gen
   - name: audit
   - name: auth_audit_gen
@@ -195,7 +194,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .lint
   - name: lint_fuzzer_sanity_patch
   - name: test_api_version_compatibility
@@ -356,7 +354,6 @@ buildvariants:
   - name: compile_test_and_package_parallel_dbtest_stream_TG
     distros:
     - ubuntu1804-xlarge
-  - name: build_variant_gen
   - name: jsCore
   - name: jsCore_txns
   - name: unittest_shell_hang_analyzer_gen
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index 77747c00065..a2b5f4b1322 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -99,7 +99,8 @@ variables:
 - &gen_task_template
   name: gen_task_template
   depends_on:
-  - name: build_variant_gen
+  - name: version_gen
+    variant: generate-tasks-for-version
   - name: archive_dist_test_debug
   commands:
   - func: "generate resmoke tasks"
@@ -164,7 +165,8 @@ variables:
   name: jstestfuzz_template
   exec_timeout_secs: 14400 # Time out the task if it runs for more than 4 hours.
   depends_on:
-  - build_variant_gen
+  - name: version_gen
+    variant: generate-tasks-for-version
   - archive_dist_test_debug
   commands:
   - func: "generate resmoke tasks"
@@ -970,11 +972,7 @@ functions:
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
       bucket: mciuploads
-      # This expansion's name was shortened to reduce the overall size of
-      # the generated configuration file
-      # gtcl = gen_task_config_location
-      # gtcl expansion is a variable included in the call of the parent function.
-      remote_file: ${project}/${gtcl}
+      remote_file: ${project}/${revision}/generate_tasks/generated-config-${version_id}.tgz
       local_file: "generate_tasks_config.tgz"
 
   "extract generated test configuration": &extract_generated_test_configuration
@@ -1003,11 +1001,6 @@ functions:
       binary: bash
       args:
       - "./src/evergreen/selected_tests_generate.sh"
-  # this sets the gtcl expansion
-  - command: expansions.update
-    params:
-      ignore_missing_file: false
-      file: src/gtcl_update_expansions.yml
   - *f_expansions_write
   - command: archive.targz_pack
     params:
@@ -1020,7 +1013,7 @@ functions:
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
       local_file: generate_tasks_config.tgz
-      remote_file: ${project}/${gtcl}
+      remote_file: ${project}/${revision}/generate_tasks/generated-config-${version_id}.tgz
       bucket: mciuploads
       permissions: public-read
       content_type: ${content_type|application/gzip}
@@ -1032,7 +1025,7 @@ functions:
       files:
       - src/generated_resmoke_config/*.json
 
-  "generate build variant":
+  "generate version":
   - *f_expansions_write
   - *configure_evergreen_api_credentials
   - command: subprocess.exec
@@ -1040,13 +1033,7 @@ functions:
     params:
       binary: bash
       args:
-      - "./src/evergreen/generate_build_variant.sh"
-  # this sets the gtcl expansion
-  - command: expansions.update
-    params:
-      ignore_missing_file: false
-      file: src/gtcl_update_expansions.yml
-  - *f_expansions_write
+      - "./src/evergreen/generate_version.sh"
   - command: archive.targz_pack
     params:
       target: generate_tasks_config.tgz
@@ -1058,7 +1045,7 @@ functions:
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
       local_file: generate_tasks_config.tgz
-      remote_file: ${project}/${gtcl}
+      remote_file: ${project}/${revision}/generate_tasks/generated-config-${version_id}.tgz
       bucket: mciuploads
       permissions: public-read
       content_type: ${content_type|application/gzip}
@@ -4177,7 +4164,7 @@ tasks:
       repeat_tests_min: 2
       repeat_tests_max: 1000
 
-- name: build_variant_gen
+- name: version_gen
   commands:
   - command: manifest.load
   - *git_get_project
@@ -4187,7 +4174,7 @@ tasks:
   - *cleanup_environment
   - func: "set up venv"
   - func: "upload pip requirements"
-  - func: "generate build variant"
+  - func: "generate version"
 
 - name: selected_tests_gen
   tags: []
diff --git a/etc/evergreen_yml_components/variants/atlas.yml b/etc/evergreen_yml_components/variants/atlas.yml
index 05410c3336f..adf3c2d7760 100644
--- a/etc/evergreen_yml_components/variants/atlas.yml
+++ b/etc/evergreen_yml_components/variants/atlas.yml
@@ -31,7 +31,6 @@ buildvariants:
   - name: compile_build_tools_next_TG
     distros:
     - rhel70
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: audit
   - name: auth_audit_gen
diff --git a/etc/evergreen_yml_components/variants/ibm.yml b/etc/evergreen_yml_components/variants/ibm.yml
index f5d00653a74..88ef898955d 100644
--- a/etc/evergreen_yml_components/variants/ibm.yml
+++ b/etc/evergreen_yml_components/variants/ibm.yml
@@ -31,7 +31,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel81-power8-large
-  - name: build_variant_gen
   - name: .aggregation .common
   - name: audit
   - name: .auth !.multiversion !.jscore
@@ -88,7 +87,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel72-zseries-build
-  - name: build_variant_gen
   - name: .aggregation .common
   - name: audit
   - name: .auth !.multiversion !.jscore
@@ -145,7 +143,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel83-zseries-large
-  - name: build_variant_gen
   - name: .aggregation .common
   - name: audit
   - name: .auth !.multiversion !.jscore
diff --git a/etc/evergreen_yml_components/variants/in_memory.yml b/etc/evergreen_yml_components/variants/in_memory.yml
index 1cdae6f7c7a..9cbd9a9065f 100644
--- a/etc/evergreen_yml_components/variants/in_memory.yml
+++ b/etc/evergreen_yml_components/variants/in_memory.yml
@@ -20,7 +20,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel80-xlarge
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: .aggregation !.unwind !.encrypt
   - name: audit
@@ -89,7 +88,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - windows-vsCurrent-large
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: audit
   - name: auth_audit_gen
diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml
index fee3c5d9466..8f3ed095b45 100644
--- a/etc/evergreen_yml_components/variants/misc_release.yml
+++ b/etc/evergreen_yml_components/variants/misc_release.yml
@@ -27,7 +27,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - amazon1-2018-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
@@ -83,7 +82,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - amazon1-2018-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.multiversion
@@ -137,7 +135,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - amazon2-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
@@ -197,7 +194,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - amazon2-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: audit
@@ -251,7 +247,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - amazon2-arm64-large
-  - name: build_variant_gen
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -306,7 +301,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - amazon2-arm64-large
-  - name: build_variant_gen
   - name: test_api_version_compatibility
   - name: .aggfuzzer
   - name: .aggregation
@@ -425,7 +419,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - debian10-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: aggregation_auth
@@ -484,7 +477,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - debian10-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
@@ -537,7 +529,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - debian11-large
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: aggregation_auth
@@ -596,7 +587,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - debian11-large
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
@@ -647,7 +637,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel70
-  - name: build_variant_gen
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -689,7 +678,6 @@ buildvariants:
   - name: compile_and_archive_dist_test_then_package_TG
     distros:
     - rhel70
-  - name: build_variant_gen
   - name: .ssl
   - name: jsCore
   - name: external_auth
@@ -711,7 +699,6 @@ buildvariants:
   - name: compile_and_archive_dist_test_then_package_TG
     distros:
     - rhel80-large
-  - name: build_variant_gen
   - name: jsCore
   - name: sharding_gen
   - name: replica_sets_gen
@@ -740,7 +727,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel80-build
-  - name: build_variant_gen
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -801,7 +787,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel80-large
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: .aggregation
   - name: audit
@@ -908,7 +893,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel82-arm64-large
-  - name: build_variant_gen
   - name: aggregation
   - name: .auth !.audit !.multiversion
   - name: causally_consistent_jscore_txns_passthrough
@@ -961,7 +945,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - rhel82-arm64-large
-  - name: build_variant_gen
   - name: .aggfuzzer !.multiversion
   - name: audit
   - name: auth_audit_gen
@@ -1021,7 +1004,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - suse12-sp5-large
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
@@ -1076,7 +1058,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - suse12-sp5-large
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
@@ -1125,7 +1106,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - suse15-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common !.multiversion
   - name: audit
   - name: causally_consistent_jscore_txns_passthrough
@@ -1172,7 +1152,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - suse15-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common !.multiversion
   - name: aggregation
   - name: .auth !.audit !.multiversion
@@ -1223,7 +1202,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - ubuntu1804-build
-  - name: build_variant_gen
   - name: .aggfuzzer .common
   - name: aggregation
   - name: .auth !.audit !.multiversion
@@ -1293,7 +1271,6 @@ buildvariants:
   - name: libdeps_graph_linting_TG
     distros:
     - ubuntu1804-build
-  - name: build_variant_gen
   - name: .csfle
   - name: .publish_csfle
   - name: .aggfuzzer .common
@@ -1357,7 +1334,6 @@ buildvariants:
     scons_cache_scope: shared
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: aggregation
   - name: aggregation_wildcard_fuzzer_gen
   - name: .auth !.audit !.multiversion !.jscore
@@ -1413,7 +1389,6 @@ buildvariants:
     scons_cache_scope: shared
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: free_monitoring
   - name: jsCore
   - name: replica_sets_jscore_passthrough
@@ -1449,7 +1424,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - ubuntu2004-large
-  - name: build_variant_gen
   - name: .aggfuzzer .common !.multiversion
   - name: aggregation
   - name: .auth !.audit !.multiversion
@@ -1507,7 +1481,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - ubuntu2004-large
-  - name: build_variant_gen
   - name: .csfle
   - name: .publish_csfle
   - name: .aggfuzzer .common !.multiversion
@@ -1563,7 +1536,6 @@ buildvariants:
     scons_cache_scope: shared
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: aggregation
   - name: aggregation_wildcard_fuzzer_gen
   - name: .auth !.audit !.multiversion !.jscore
@@ -1616,7 +1588,6 @@ buildvariants:
     scons_cache_scope: shared
   tasks:
   - name: compile_test_and_package_serial_TG
-  - name: build_variant_gen
   - name: free_monitoring
   - name: jsCore
   - name: replica_sets_jscore_passthrough
@@ -1656,7 +1627,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - windows-vsCurrent-large
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
@@ -1721,7 +1691,6 @@ buildvariants:
   - name: compile_test_and_package_serial_TG
     distros:
     - windows-vsCurrent-large
-  - name: build_variant_gen
   - name: .aggfuzzer
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
@@ -1780,7 +1749,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_build_tools_next_TG
-  - name: build_variant_gen
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
   - name: .causally_consistent !.sharding
@@ -1832,7 +1800,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_build_tools_next_TG
-  - name: build_variant_gen
   - name: .aggregation !.auth !.encrypt !.unwind
   - name: auth_gen
   - name: .causally_consistent !.sharding
@@ -1887,7 +1854,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_build_tools_next_TG
-  - name: build_variant_gen
   - name: audit
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
@@ -1927,7 +1893,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_build_tools_next_TG
-  - name: build_variant_gen
   - name: audit
   - name: auth_audit_gen
   - name: causally_consistent_jscore_txns_passthrough
diff --git a/etc/evergreen_yml_components/variants/sanitizer.yml b/etc/evergreen_yml_components/variants/sanitizer.yml
index 371d90692f9..ec0da723723 100644
--- a/etc/evergreen_yml_components/variants/sanitizer.yml
+++ b/etc/evergreen_yml_components/variants/sanitizer.yml
@@ -22,7 +22,6 @@ buildvariants:
     separate_debug: off
   tasks:
     - name: compile_test_and_package_serial_TG
-    - name: build_variant_gen
     - name: .aggfuzzer .common
     - name: free_monitoring
     - name: .jstestfuzz !.initsync
@@ -54,7 +53,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_benchmarks
-  - name: build_variant_gen
   - name: .aggregation
   - name: .auth
   - name: audit
@@ -128,7 +126,6 @@ buildvariants:
   tasks:
   - name: compile_test_and_package_serial_TG
   - name: compile_benchmarks
-  - name: build_variant_gen
   - name: .aggregation
   - name: .auth
   - name: audit
diff --git a/etc/evergreen_yml_components/variants/task_generation.yml b/etc/evergreen_yml_components/variants/task_generation.yml
new file mode 100644
index 00000000000..9c09890e566
--- /dev/null
+++ b/etc/evergreen_yml_components/variants/task_generation.yml
@@ -0,0 +1,11 @@
+# Build variant to generate tasks for evergreen versions.
+
+buildvariants:
+- name: generate-tasks-for-version
+  display_name: "Generate tasks for evergreen version"
+  modules:
+  - enterprise
+  run_on:
+  - rhel80-medium
+  tasks:
+  - name: version_gen