Migrate to new dockerfile

pull/16945/head
Lidi Zheng 6 years ago
parent 21ea6718cb
commit f57f142b23
  1. 6
      tools/dockerfile/test/python_testing_x64/Dockerfile
  2. 4
      tools/run_tests/run_tests.py

@ -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

@ -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'

Loading…
Cancel
Save