diff options
| author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2022-08-09 16:11:15 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-09 18:53:51 +0000 |
| commit | e86809ff7094a3612dad2aa1acd354352676966a (patch) | |
| tree | 1bd95771185b6c8d499782940d5bb16efd979413 /etc | |
| parent | e5d2ce8e463d80aee21d6a7c04942e7fd02b8d9b (diff) | |
| download | mongo-e86809ff7094a3612dad2aa1acd354352676966a.tar.gz | |
SERVER-68568 Override version with future tag
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 3 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 51 |
2 files changed, 31 insertions, 23 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 2a78dd4b636..da7bcc99826 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1831,6 +1831,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 b8a56d15785..7400cd89940 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -498,7 +498,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 @@ -507,6 +507,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: @@ -1175,23 +1179,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 @@ -2875,8 +2884,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 @@ -2996,8 +3004,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 @@ -4266,7 +4273,7 @@ tasks: - *cleanup_environment - func: "set up venv" - func: "upload pip requirements" - - func: "generate version expansions" + - func: "generate and upload version expansions" - <<: *gen_task_template name: auth_audit_gen @@ -6621,8 +6628,7 @@ tasks: commands: - command: manifest.load - func: "git get project and add git tag" - - func: "get version expansions" - - func: "apply version expansions" + - func: "get and apply version expansions" - func: "f_expansions_write" - func: "kill processes" - func: "cleanup environment" @@ -7107,8 +7113,7 @@ tasks: - func: "upload pip requirements" - func: "get buildnumber" - func: "f_expansions_write" - - func: "get version expansions" - - func: "apply version expansions" + - func: "get and apply version expansions" - func: "f_expansions_write" - func: "generate compile expansions" - func: "apply compile expansions" |