SERVER-83208 fix future git tag multiversion dependency chain

Author: Trevor159

buildscripts/resmokelib/utils/evergreen_conn.py

@@ -272,11 +272,15 @@ def _filter_successful_tasks(evg_api: RetryingEvergreenApi,
 
         # Only set the compile task if there isn't one already, otherwise
         # newer tasks like "archive_dist_test_debug" take precedence.
-        if evg_task.display_name in ("compile", "archive_dist_test") and compile_task is None:
+        if evg_task.display_name in (
+                "compile", "archive_dist_test",
+                "archive_dist_test_future_git_tag_multiversion") and compile_task is None:
             compile_task = evg_task
         elif evg_task.display_name == "push":
             push_task = evg_task
-        elif evg_task.display_name == "archive_dist_test_debug":
+        elif evg_task.display_name in ("archive_dist_test_debug",
+                                       "archive_dist_test_debug_future_git_tag_multiversion"
+                                       ) and archive_symbols_task is None:
             archive_symbols_task = evg_task
         if compile_task and push_task and archive_symbols_task:
             break

etc/evergreen.yml

@@ -1720,14 +1720,12 @@ buildvariants:
     test_flags: >-
       --excludeWithAnyTags=future_git_tag_incompatible
   depends_on:
-  - name: version_expansions_gen
-    variant: &enterprise-rhel-80-64-bit-future-git-tag-multiversion-version-gen enterprise-rhel-80-64-bit-future-git-tag-multiversion-version-gen
   - name: version_gen
     variant: generate-tasks-for-version
     # This is added because of EVG-18211.
     # Without this we are adding extra dependencies on evergreen and it is causing strain
     omit_generated_tasks: true
-  - name: archive_dist_test
+  - name: archive_dist_test_debug_future_git_tag_multiversion
     variant: linux-x86-dynamic-compile-future-tag-multiversion
   tasks:
   - name: .multiversion !.future_git_tag_incompatible
@@ -1738,19 +1736,6 @@ buildvariants:
   # If we decide we need this task we can add it to its own variant that depends on archive_dist_test_debug
   # - name: generate_buildid_to_debug_symbols_mapping
 
-# This variant exists becuase this is the only way to correctly have
-# enterprise-rhel-80-64-bit-future-git-tag-multiversion depend the the "correct" version_expansions_gen task
-# Without this extra variant depending on version_expansions_gen will yeild the version_expansions_gen task in version_gen
-# Adding this variant removes that race condition
-- <<: *enterprise-rhel-80-64-bit-future-git-tag-multiversion-template
-  name: *enterprise-rhel-80-64-bit-future-git-tag-multiversion-version-gen
-  display_name: "Enterprise RHEL 8.0 (future git tag multiversion) (version gen)"
-  depends_on: null
-  tasks:
-  - name: version_expansions_gen
-    distros:
-    - rhel80-small
-
 - name: &enterprise-rhel-80-64-bit-suggested enterprise-rhel-80-64-bit-suggested
   display_name: "* Enterprise RHEL 8.0"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter

etc/evergreen_yml_components/definitions.yml

@@ -2666,7 +2666,8 @@ functions:
 tasks:
 
 ## compile - build all scons targets except unittests ##
-- name: compile_dist_test
+- &compile_dist_test
+  name: compile_dist_test
   tags: []
   depends_on:
   - name: version_expansions_gen
@@ -2680,6 +2681,11 @@ tasks:
       task_compile_flags: >-
         PREFIX=dist-test
 
+- <<: *compile_dist_test
+  name: compile_dist_test_future_git_tag_multiversion
+  depends_on:
+  - name: version_expansions_future_git_tag_multiversion_gen
+
 ## compile - build bazel targets ##
 ## The bazel migration is in progress & this
 ## task ensures we can build with bazel.
@@ -2938,7 +2944,8 @@ tasks:
       args:
       - "src/evergreen/gen_patch_test_tags.sh"
 
-- name: archive_dist_test
+- &archive_dist_test
+  name: archive_dist_test
   tags: []
   depends_on:
   - name: compile_dist_test
@@ -3036,7 +3043,13 @@ tasks:
       content_type: application/tar
       display_name: Python venv (see included venv_readme.txt)
 
-- name: archive_dist_test_debug
+- <<: *archive_dist_test
+  name: archive_dist_test_future_git_tag_multiversion
+  depends_on:
+  - name: compile_dist_test_future_git_tag_multiversion
+
+- &archive_dist_test_debug
+  name: archive_dist_test_debug
   tags: []
   depends_on:
   - name: archive_dist_test
@@ -3050,6 +3063,11 @@ tasks:
 
   - func: "upload debugsymbols"
 
+- <<: *archive_dist_test_debug
+  name: archive_dist_test_debug_future_git_tag_multiversion
+  depends_on:
+  - name: archive_dist_test_future_git_tag_multiversion
+
 - name: compile_ninja
   tags: []
   depends_on:
@@ -3320,7 +3338,8 @@ tasks:
       display_name: Libdeps Graph Data
 
 ## compile_all - build all scons targets ##
-- name: compile_all
+- &compile_all
+  name: compile_all
   tags: []
   depends_on:
   - name: compile_dist_test
@@ -3330,6 +3349,11 @@ tasks:
       targets: install-all-meta
       compiling_for_test: true
 
+- <<: *compile_all
+  name: compile_all_future_git_tag_multiversion
+  depends_on:
+  - name: compile_dist_test_future_git_tag_multiversion
+
 - name: compile_all_but_not_unittests
   tags: []
   depends_on:
@@ -3380,6 +3404,11 @@ tasks:
       targets: install-unittests install-unittests-debug
       compiling_for_test: true
 
+- <<: *compile_unittests
+  name: compile_unittests_future_git_tag_multiversion
+  depends_on:
+  - name: compile_dist_test_future_git_tag_multiversion
+
 - name: build_metrics_tasks_gen
   depends_on:
   - name: version_expansions_gen
@@ -3422,7 +3451,8 @@ tasks:
   name: compile_unittests_for_recorded_unittest
 
 ## run_unittests ##
-- name: run_unittests
+- &run_unittests
+  name: run_unittests
   tags: []
   depends_on:
   - name: compile_unittests
@@ -3437,6 +3467,11 @@ tasks:
       suite: unittests
       install_dir: build/install/bin
 
+- <<: *run_unittests
+  name: run_unittests_future_git_tag_multiversion
+  depends_on:
+  - name: compile_unittests_future_git_tag_multiversion
+
 ## pretty_printer ##
 - <<: *task_template
   name: run_pretty_printer_tests
@@ -3568,7 +3603,8 @@ tasks:
   - func: "run tests"
 
 ## compile_dbtest ##
-- name: compile_dbtest
+- &compile_dbtest
+  name: compile_dbtest
   tags: []
   depends_on:
   - name: compile_dist_test
@@ -3578,8 +3614,14 @@ tasks:
       targets: install-dbtest install-dbtest-debug
       compiling_for_test: true
 
+- <<: *compile_dbtest
+  name: compile_dbtest_future_git_tag_multiversion
+  depends_on:
+  - name: compile_dist_test_future_git_tag_multiversion
+
 ## run_dbtest ##
-- name: run_dbtest
+- &run_dbtest
+  name: run_dbtest
   tags: []
   depends_on:
   - name: compile_dbtest
@@ -3594,7 +3636,13 @@ tasks:
       suite: dbtest
       install_dir: build/install/bin
 
-- name: archive_dbtest
+- <<: *run_dbtest
+  name: run_dbtest_future_git_tag_multiversion
+  depends_on:
+  - name: compile_dbtest_future_git_tag_multiversion
+
+- &archive_dbtest
+  name: archive_dbtest
   tags: []
   depends_on:
   - name: compile_dbtest
@@ -3604,6 +3652,11 @@ tasks:
       targets: archive-dbtest archive-dbtest-debug
       compiling_for_test: true
 
+- <<: *archive_dbtest
+  name: archive_dbtest_future_git_tag_multiversion
+  depends_on:
+  - name: compile_dbtest_future_git_tag_multiversion
+
 - name: compile_integration_test
   tags: []
   depends_on:
@@ -5531,7 +5584,8 @@ tasks:
   - func: "upload pip requirements"
   - func: "generate version burn in"
 
-- name: version_expansions_gen
+- &version_expansions_gen
+  name: version_expansions_gen
   commands:
   - command: manifest.load
   - *git_get_project
@@ -5544,6 +5598,9 @@ tasks:
   - func: "generate and upload version expansions"
   - func: "generate and upload resmoke constants"
 
+- <<: *version_expansions_gen
+  name: version_expansions_future_git_tag_multiversion_gen
+
 - <<: *gen_task_template
   name: auth_audit_gen
   tags: ["auth", "audit", "patch_build"]
@@ -9497,6 +9554,19 @@ task_groups:
   - archive_dbtest
   - compile_all
 
+- <<: *compile_task_group_template
+  name: compile_test_serial_future_git_tag_multiversion_TG
+  tasks:
+  - compile_dist_test_future_git_tag_multiversion
+  - archive_dist_test_future_git_tag_multiversion
+  - archive_dist_test_debug_future_git_tag_multiversion
+  - compile_unittests_future_git_tag_multiversion
+  - run_unittests_future_git_tag_multiversion
+  - compile_dbtest_future_git_tag_multiversion
+  - run_dbtest_future_git_tag_multiversion
+  - archive_dbtest_future_git_tag_multiversion
+  - compile_all_future_git_tag_multiversion
+
 - <<: *compile_task_group_template
   name: compile_test_and_package_serial_TG
   tasks:

etc/evergreen_yml_components/variants/compile_static_analysis.yml

@@ -138,11 +138,9 @@ buildvariants:
     <<: *linux-x86-dynamic-compile-expansions
     bv_future_git_tag: r100.0.0-9999
     compile_variant: *linux-x86-dynamic-compile-future-tag-multiversion
-  depends_on:
-  - name: version_expansions_gen
-    variant: enterprise-rhel-80-64-bit-future-git-tag-multiversion-version-gen
   tasks:
-  - name: compile_test_serial_TG
+  - name: version_expansions_future_git_tag_multiversion_gen
+  - name: compile_test_serial_future_git_tag_multiversion_TG
 
 - <<: *generic_linux_compile_params
   name: &linux-x86-dynamic-debug-compile-required linux-x86-dynamic-debug-compile-required  # TODO: replace with Sanitizer.