summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMikhail Shchatko <mikhail.shchatko@mongodb.com>2021-10-03 00:07:47 +0300
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-10-05 07:34:56 +0000
commitb322eb31ae089275f15a2a6ad4b4a08685e0a956 (patch)
tree8bcccc67228cd662bbdfb54359253cb44b648fdd /etc
parenta0bd289488a333dde984b5bf21a1011dd3345d39 (diff)
downloadmongo-b322eb31ae089275f15a2a6ad4b4a08685e0a956.tar.gz
SERVER-60376 Fix venv setup on container distros
Diffstat (limited to 'etc')
-rw-r--r--etc/evergreen.yml26
1 files changed, 13 insertions, 13 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 51e6570f8d7..1ea04ccfa20 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -506,17 +506,16 @@ functions:
params:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
- remote_file: ${project}/${build_variant}/${revision}/mongodb-mongo-venv/${build_id}.tgz
+ remote_file: ${project}/${build_variant}/${revision}/venv/${build_id}.tgz
bucket: mciuploads
- # Python venv is not relocatable and should be placed in /data/mci
- extract_to: ".."
+ extract_to: "."
- "add symlinks back to venv": &add_symlinks_back_to_venv
+ "adjust venv": &adjust_venv
command: subprocess.exec
params:
binary: bash
args:
- - "src/evergreen/functions/venv_symlinks_add_back.sh"
+ - "src/evergreen/functions/venv_adjust.sh"
"fetch packages": &fetch_packages
command: s3.get
@@ -876,7 +875,7 @@ functions:
- *kill_processes
- *cleanup_environment
- *fetch_venv
- - *add_symlinks_back_to_venv
+ - *adjust_venv
- *fetch_binaries
- *extract_binaries
- *check_binary_version
@@ -1117,7 +1116,7 @@ functions:
- *kill_processes
- *cleanup_environment
- *fetch_venv
- - *add_symlinks_back_to_venv
+ - *adjust_venv
- *f_expansions_write
- *configure_evergreen_api_credentials
@@ -2126,22 +2125,23 @@ tasks:
- command: archive.targz_pack
params:
- target: "mongodb-mongo-venv.tgz"
- source_dir: ".."
+ target: "venv.tgz"
+ source_dir: "./"
include:
- - "./mongodb-mongo-venv/**"
+ - "./venv/**"
+ - "./venv_readme.txt"
- command: s3.put
params:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
- local_file: mongodb-mongo-venv.tgz
- remote_file: ${project}/${build_variant}/${revision}/mongodb-mongo-venv/${build_id}.tgz
+ local_file: venv.tgz
+ remote_file: ${project}/${build_variant}/${revision}/venv/${build_id}.tgz
bucket: mciuploads
permissions: private
visibility: signed
content_type: application/tar
- display_name: Python venv (see included README.txt)
+ display_name: Python venv (see included venv_readme.txt)
- name: archive_dist_test_debug
tags: []