aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2018-05-04 12:00:25 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2018-05-04 16:16:29 -0700
commitfcd04ec121664de621ceb874c44eab5fbdc6bbd7 (patch)
tree2bf84940cd17ecf4aa31b63744ace38da1f90b5c /tools/dockerfile
parentd5f659a2d265931f86aef3c92ad7a977c3bae8a5 (diff)
Remove the fallback when creating Python virtual env
See https://github.com/grpc/grpc/issues/15253 for more context. The original behavior when running Python tests is to try to create a virtual env with the specifed Python version. If there is an issue with that, fallback to the system's default Python version. This leads to misleading test results, so removing the fallback and failing the test when virtual env fails to instantiate the specified Python version is the new behavior.
Diffstat (limited to 'tools/dockerfile')
-rw-r--r--tools/dockerfile/test/python_jessie_x64/Dockerfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile
index 41b670c06c..bd9d55ed8a 100644
--- a/tools/dockerfile/test/python_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile
@@ -68,6 +68,10 @@ RUN pip install --upgrade pip==10.0.1
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0
+# Install pip and virtualenv for Python 3.4
+RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4
+RUN python3.4 -m pip install virtualenv
+
# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
RUN ln -s /usr/bin/ccache /usr/local/bin/g++