diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-05 12:24:41 -0400 |
|---|---|---|
| committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-08 14:08:49 -0400 |
| commit | 415dfa9ec016d8a1e37d950adda64a17efc950c1 (patch) | |
| tree | fd5762210066bd2af6f230ff8d4d754f4ccd2bdd /etc/system_perf.yml | |
| parent | 8dd6d4755734ed37c1b98dfdefce3ca6bc65f1f6 (diff) | |
| download | mongo-415dfa9ec016d8a1e37d950adda64a17efc950c1.tar.gz | |
SERVER-32295 Support Python 3 builds in Perf configs
Diffstat (limited to 'etc/system_perf.yml')
| -rw-r--r-- | etc/system_perf.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/etc/system_perf.yml b/etc/system_perf.yml index ca6f1e63e2e..81a3eee9fb0 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -55,7 +55,7 @@ post: # these default values in the distro config in evergreen. if [ -d "${scons_cache_path}" ]; then - /opt/mongodbtoolchain/v3/bin/python2 buildscripts/scons_cache_prune.py --cache-dir ${scons_cache_path} --cache-size ${scons_cache_size|200} --prune-ratio ${scons_prune_ratio|0.8} + /opt/mongodbtoolchain/v3/bin/python3 buildscripts/scons_cache_prune.py --cache-dir ${scons_cache_path} --cache-size ${scons_cache_size|200} --prune-ratio ${scons_prune_ratio|0.8} fi functions: @@ -81,8 +81,9 @@ functions: set -o errexit set -o verbose + /opt/mongodbtoolchain/v3/bin/virtualenv --python /opt/mongodbtoolchain/v3/bin/python3 "${workdir}/compile_venv" /opt/mongodbtoolchain/v3/bin/virtualenv --python /opt/mongodbtoolchain/v3/bin/python2 "${workdir}/venv" - source "${workdir}/venv/bin/activate" + source "${workdir}/compile_venv/bin/activate" python2 -m pip install -r etc/pip/compile-requirements.txt @@ -110,8 +111,8 @@ functions: # This script converts the generated version string into a sanitized version string for # use by scons and uploading artifacts as well as information about for the scons cache. - source "${workdir}/venv/bin/activate" - MONGO_VERSION=$MONGO_VERSION USE_SCONS_CACHE=${use_scons_cache|false} python2 buildscripts/generate_compile_expansions.py --out compile_expansions.yml + source "${workdir}/compile_venv/bin/activate" + MONGO_VERSION=$MONGO_VERSION USE_SCONS_CACHE=${use_scons_cache|false} python buildscripts/generate_compile_expansions.py --out compile_expansions.yml # Then we load the generated version data into the agent so we can use it in task definitions - command: expansions.update params: @@ -144,8 +145,8 @@ functions: script: | set -o errexit set -o verbose - source "${workdir}/venv/bin/activate" - python2 ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} mongo${extension} --use-new-tools mongod${extension} mongos${extension} MONGO_VERSION=${version} + source "${workdir}/compile_venv/bin/activate" + python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} mongo${extension} --use-new-tools mongod${extension} mongos${extension} MONGO_VERSION=${version} mkdir -p mongodb/bin mkdir -p mongodb/jstests/hooks mv mongo${extension|} mongodb/bin |