summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian McCarthy <brian.mccarthy@mongodb.com>2018-05-29 15:22:59 -0400
committerBrian McCarthy <brian.mccarthy@mongodb.com>2018-05-30 11:48:24 -0400
commitf74dc79abf9b6a317a550e95089ec3a0d45ec085 (patch)
tree39dba2ed67a0fe301c416e5a35ef79b697715f7e
parent16d96f4ef0a11543b2035e58867840a410afdff1 (diff)
downloadmongo-f74dc79abf9b6a317a550e95089ec3a0d45ec085.tar.gz
SERVER-35273 Use toolchain virtualenv for Amazon Linux
-rw-r--r--etc/evergreen.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index a7a474d06f6..5b1f2f68827 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -967,14 +967,15 @@ functions:
python_loc=$(which ${python|/opt/mongodbtoolchain/v2/bin/python2})
python3_loc=$(which ${python|/opt/mongodbtoolchain/v2/bin/python3})
+ virtualenv_loc=$(which ${virtualenv|virtualenv})
if [ "Windows_NT" = "$OS" ]; then
python_loc=$(cygpath -w $python_loc)
python3_loc=$(cygpath -w c:/python/Python36/python.exe)
fi
# Set up virtualenv in ${workdir}
- virtualenv --python "$python_loc" --system-site-packages "${workdir}/venv"
+ "$virtualenv_loc" --python "$python_loc" --system-site-packages "${workdir}/venv"
# Add virtualenv for python3 in ${workdir}
- virtualenv --python "$python3_loc" --system-site-packages "${workdir}/venv_3"
+ "$virtualenv_loc" --python "$python3_loc" --system-site-packages "${workdir}/venv_3"
"run tests" :
- *determine_task_timeout
@@ -7657,6 +7658,7 @@ buildvariants:
gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
tooltags: "-tags 'ssl sasl'"
build_mongoreplay: true
+ virtualenv: /opt/mongodbtoolchain/v2/bin/virtualenv
display_tasks:
- *unittests
tasks:
@@ -7733,6 +7735,7 @@ buildvariants:
gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
tooltags: "-tags 'ssl'"
build_mongoreplay: true
+ virtualenv: /opt/mongodbtoolchain/v2/bin/virtualenv
display_tasks:
- *unittests
tasks: