diff options
| -rw-r--r-- | tools/dockerfile/test/python_testing_x64/Dockerfile | 6 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/dockerfile/test/python_testing_x64/Dockerfile b/tools/dockerfile/test/python_testing_x64/Dockerfile index addc5b2958..85a34c865a 100644 --- a/tools/dockerfile/test/python_testing_x64/Dockerfile +++ b/tools/dockerfile/test/python_testing_x64/Dockerfile @@ -71,7 +71,11 @@ RUN pip install --upgrade google-api-python-client oauth2client # Install Python 3 RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local -RUN apt-get update && apt-get -t testing install -y python2.7 python3.7 +RUN apt-get update && apt-get -t testing install -y python2.7 python3.5 python3.6 python3.7 python-all-dev python3-all-dev + +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# RUN apt-get -t testing install -y python3-distutils +# RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 RUN mkdir /var/local/jenkins diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 63f6b04b53..53c8a2f4fb 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -759,9 +759,7 @@ class PythonLanguage(object): self.python_manager_name(), _docker_arch_suffix(self.args.arch)) def python_manager_name(self): - if self.args.compiler in ['python3.5', 'python3.6']: - return 'pyenv' - elif self.args.compiler == 'python3.7': + if self.args.compiler in ['python3.5', 'python3.6', 'python3.7']: return 'testing' elif self.args.compiler == 'python_alpine': return 'alpine' |