SERVER-68568 Override version with future tag

(cherry picked from commit e86809ff7094a3612dad2aa1acd354352676966a)

2 files changed, 34 insertions, 19 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 2f3bf49bc66..7184fbd9c00 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -1914,6 +1914,9 @@ buildvariants:
     test_flags: >-
       --excludeWithAnyTags=future_git_tag_incompatible
   tasks:
+  - name: version_expansions_gen
+    distros:
+    - rhel80-small
   - name: compile_test_and_package_parallel_core_stream_TG
     distros:
     - rhel80-xlarge
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index d02522ed2be..da00c3e1bca 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -515,7 +515,7 @@ functions:
     params:
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
-      remote_file: ${project}/${version_id}/version_expansions.yml
+      remote_file: ${project}/${version_id}/${bv_future_git_tag|version}_expansions.yml
       bucket: mciuploads
       local_file: src/version_expansions.yml
 
@@ -524,6 +524,10 @@ functions:
     params:
       file: src/version_expansions.yml
 
+  "get and apply version expansions":
+    - *get_version_expansions
+    - *apply_version_expansions
+
   "fetch benchmarks": &fetch_benchmarks
     command: s3.get
     params:
@@ -1240,23 +1244,28 @@ functions:
       args:
       - "src/evergreen/scons_compile.sh"
 
-  "generate version expansions":
-  - *f_expansions_write
-  - command: subprocess.exec
+  "generate version expansions": &generate_version_expansions
+    command: subprocess.exec
     params:
       binary: bash
       args:
       - "src/evergreen/functions/version_expansions_generate.sh"
-  - command: s3.put
-    params:
-      aws_key: ${aws_key}
-      aws_secret: ${aws_secret}
-      local_file: src/version_expansions.yml
-      remote_file: ${project}/${version_id}/version_expansions.yml
-      bucket: mciuploads
-      permissions: public-read
-      content_type: application/x-yaml
-      display_name: version expansions
+
+  "upload version expansions": &upload_version_expansions
+   command: s3.put
+   params:
+     aws_key: ${aws_key}
+     aws_secret: ${aws_secret}
+     local_file: src/version_expansions.yml
+     remote_file: ${project}/${version_id}/${bv_future_git_tag|version}_expansions.yml
+     bucket: mciuploads
+     permissions: public-read
+     content_type: application/x-yaml
+     display_name: version expansions
+
+  "generate and upload version expansions":
+  - *generate_version_expansions
+  - *upload_version_expansions
 
   "generate compile expansions":
   - *f_expansions_write
@@ -1532,6 +1541,8 @@ functions:
       - "./src/evergreen/powercycle_exit.sh"
 
   "run packager.py":
+  - *get_version_expansions
+  - *apply_version_expansions
   - *f_expansions_write
   - command: subprocess.exec
     params:
@@ -2855,8 +2866,7 @@ tasks:
   depends_on:
   - name: stitch_support_install_tests
   commands:
-  - func: "get version expansions"
-  - func: "apply version expansions"
+  - func: "get and apply version expansions"
   - *f_expansions_write
   - command: subprocess.exec
     type: test
@@ -2976,8 +2986,7 @@ tasks:
   depends_on:
   - name: crypt_install_tests
   commands:
-  - func: "get version expansions"
-  - func: "apply version expansions"
+  - func: "get and apply version expansions"
   - *f_expansions_write
   - command: subprocess.exec
     type: test
@@ -4273,7 +4282,7 @@ tasks:
   - *cleanup_environment
   - func: "set up venv"
   - func: "upload pip requirements"
-  - func: "generate version expansions"
+  - func: "generate and upload version expansions"
 
 - name: selected_tests_gen
   tags: []
@@ -6635,6 +6644,7 @@ tasks:
   commands:
   - command: manifest.load
   - func: "git get project and add git tag"
+  - func: "get and apply version expansions"
   - func: "f_expansions_write"
   - func: "kill processes"
   - func: "cleanup environment"
@@ -7119,6 +7129,8 @@ tasks:
   - func: "upload pip requirements"
   - func: "get buildnumber"
   - func: "f_expansions_write"
+  - func: "get and apply version expansions"
+  - func: "f_expansions_write"
   - func: "generate compile expansions"
   - func: "apply compile expansions"
   - func: "f_expansions_write"