diff options
| author | Jonathan Abrahams <jonathan@mongodb.com> | 2018-12-13 17:15:12 -0500 |
|---|---|---|
| committer | Jonathan Abrahams <jonathan@mongodb.com> | 2018-12-14 09:23:42 -0500 |
| commit | a50d12c4eb502e9ff5a2902c0f31e09f66e5dcf9 (patch) | |
| tree | 91754d5860e6189a6bbbb9a187aa90275ffa77e4 /etc | |
| parent | 3c20ed9fae8695f105c1068524997b92638ab58a (diff) | |
| download | mongo-a50d12c4eb502e9ff5a2902c0f31e09f66e5dcf9.tar.gz | |
SERVER-38615 The psutil module should be installed on all platforms
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 14 | ||||
| -rw-r--r-- | etc/pip/components/evergreen.req | 1 | ||||
| -rw-r--r-- | etc/pip/constraints.txt | 4 | ||||
| -rw-r--r-- | etc/pip/evgtest-requirements.txt | 1 |
4 files changed, 17 insertions, 3 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 9e0db73bfe6..d8c6133951d 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1308,6 +1308,18 @@ functions: fi fi + "install pip requirements" : &install_pip_requirements + command: shell.exec + params: + working_dir: src + shell: bash + script: | + set -o verbose + set -o errexit + + ${activate_virtualenv} + python2 -m pip install -r etc/pip/evgtest-requirements.txt + "determine resmoke jobs" : &determine_resmoke_jobs command: shell.exec params: @@ -1456,6 +1468,7 @@ functions: if [[ ! -f $venv2_bin/python3 ]]; then ln -sfv "$py3_exe" "$venv2_bin/python3"; fi "run tests" : + - *install_pip_requirements - *determine_task_timeout - *update_task_timeout_expansions - *update_task_timeout @@ -1484,7 +1497,6 @@ functions: # activate the virtualenv if it has been set up ${activate_virtualenv} - python2 -m pip install -r etc/pip/evgtest-requirements.txt # Set the TMPDIR environment variable to be a directory in the task's working # directory so that temporary files created by processes spawned by resmoke.py get diff --git a/etc/pip/components/evergreen.req b/etc/pip/components/evergreen.req new file mode 100644 index 00000000000..a4d92cc08db --- /dev/null +++ b/etc/pip/components/evergreen.req @@ -0,0 +1 @@ +psutil diff --git a/etc/pip/constraints.txt b/etc/pip/constraints.txt index ebd4d3c9f57..86d48613080 100644 --- a/etc/pip/constraints.txt +++ b/etc/pip/constraints.txt @@ -7,8 +7,8 @@ # Common requirements asn1crypto==0.24.0 astroid==1.6.5 -boto3==1.9.64 -botocore==1.12.64 +boto3==1.9.65 +botocore==1.12.65 certifi==2018.11.29 cffi==1.11.5 chardet==3.0.4 diff --git a/etc/pip/evgtest-requirements.txt b/etc/pip/evgtest-requirements.txt index e338d30aa20..c5e647c8f74 100644 --- a/etc/pip/evgtest-requirements.txt +++ b/etc/pip/evgtest-requirements.txt @@ -4,3 +4,4 @@ -r components/resmoke.req -r components/aws.req -r components/idl.req +-r components/evergreen.req |