From bfe2d8153df127508a8105361fbf1d4623dc1657 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 19 Oct 2018 11:59:28 -0700 Subject: Using template to generate Dockerfile --- .../test/python_testing_x64/Dockerfile.template | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template (limited to 'templates') diff --git a/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template new file mode 100644 index 0000000000..563edd38a6 --- /dev/null +++ b/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template @@ -0,0 +1,34 @@ +%YAML 1.2 +--- | + # Copyright 2016 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + + # Install Python Versions from Debain 'testing' repository + 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.5 python3.6 python3.7 python-all-dev python3-all-dev + + RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] -- cgit v1.2.3 From 1a74f991e1a7d39a609e7b127194649cb36e96c8 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 22 Oct 2018 10:39:20 -0700 Subject: Rename Dockerfile && fix typo --- .../test/python_stretch_x64/Dockerfile.template | 34 +++++++++++ .../test/python_testing_x64/Dockerfile.template | 34 ----------- .../dockerfile/test/python_stretch_x64/Dockerfile | 71 ++++++++++++++++++++++ .../dockerfile/test/python_testing_x64/Dockerfile | 71 ---------------------- tools/run_tests/run_tests.py | 2 +- 5 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template create mode 100644 tools/dockerfile/test/python_stretch_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_testing_x64/Dockerfile (limited to 'templates') diff --git a/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template new file mode 100644 index 0000000000..b897cace1e --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template @@ -0,0 +1,34 @@ +%YAML 1.2 +--- | + # Copyright 2018 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + + # Install Python Versions from Debian 'testing' repository + 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.5 python3.6 python3.7 python-all-dev python3-all-dev + + RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template deleted file mode 100644 index 563edd38a6..0000000000 --- a/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2016 gRPC authors. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - - # Install Python Versions from Debain 'testing' repository - 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.5 python3.6 python3.7 python-all-dev python3-all-dev - - RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_x64/Dockerfile b/tools/dockerfile/test/python_stretch_x64/Dockerfile new file mode 100644 index 0000000000..b325493637 --- /dev/null +++ b/tools/dockerfile/test/python_stretch_x64/Dockerfile @@ -0,0 +1,71 @@ +# Copyright 2018 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + + +# Install Python Versions from Debian 'testing' repository +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.5 python3.6 python3.7 python-all-dev python3-all-dev + +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 + + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_testing_x64/Dockerfile b/tools/dockerfile/test/python_testing_x64/Dockerfile deleted file mode 100644 index 788212b836..0000000000 --- a/tools/dockerfile/test/python_testing_x64/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - - -# Install Python Versions from Debain 'testing' repository -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.5 python3.6 python3.7 python-all-dev python3-all-dev - -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 - - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 53c8a2f4fb..a721c67245 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -760,7 +760,7 @@ class PythonLanguage(object): def python_manager_name(self): if self.args.compiler in ['python3.5', 'python3.6', 'python3.7']: - return 'testing' + return 'stretch' elif self.args.compiler == 'python_alpine': return 'alpine' else: -- cgit v1.2.3 From 0dbd7831c3338e4e55eb953204cb8b26ed427ce0 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 22 Oct 2018 11:08:45 -0700 Subject: Add different Dockerfile for each Python version --- .../test/python_stretch_35_x64/Dockerfile.template | 29 +++++++++ .../test/python_stretch_36_x64/Dockerfile.template | 32 ++++++++++ .../test/python_stretch_37_x64/Dockerfile.template | 32 ++++++++++ .../test/python_stretch_x64/Dockerfile.template | 34 ----------- .../test/python_stretch_35_x64/Dockerfile | 66 ++++++++++++++++++++ .../test/python_stretch_36_x64/Dockerfile | 69 +++++++++++++++++++++ .../test/python_stretch_37_x64/Dockerfile | 69 +++++++++++++++++++++ .../dockerfile/test/python_stretch_x64/Dockerfile | 71 ---------------------- tools/run_tests/run_tests.py | 8 ++- 9 files changed, 303 insertions(+), 107 deletions(-) create mode 100644 templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template create mode 100644 tools/dockerfile/test/python_stretch_35_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_36_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_37_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_stretch_x64/Dockerfile (limited to 'templates') diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template new file mode 100644 index 0000000000..34beaa8a49 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template @@ -0,0 +1,29 @@ +%YAML 1.2 +--- | + # Copyright 2018 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + + RUN apt-get update && apt-get install -y python2.7 python3.5 python-all-dev python3-all-dev + + RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template new file mode 100644 index 0000000000..cba11a88fd --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template @@ -0,0 +1,32 @@ +%YAML 1.2 +--- | + # Copyright 2018 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + + # Install Python Versions from Debian 'testing' repository + 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.6 python-all-dev python3-all-dev + + RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template new file mode 100644 index 0000000000..9ae0ad14bb --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template @@ -0,0 +1,32 @@ +%YAML 1.2 +--- | + # Copyright 2018 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + + # Install Python Versions from Debian 'testing' repository + 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 python-all-dev python3-all-dev + + RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template deleted file mode 100644 index b897cace1e..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 gRPC authors. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - - # Install Python Versions from Debian 'testing' repository - 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.5 python3.6 python3.7 python-all-dev python3-all-dev - - RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile new file mode 100644 index 0000000000..fa4d3b820f --- /dev/null +++ b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile @@ -0,0 +1,66 @@ +# Copyright 2018 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + + +RUN apt-get update && apt-get install -y python2.7 python3.5 python-all-dev python3-all-dev + +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 + + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile new file mode 100644 index 0000000000..988ecd9bf6 --- /dev/null +++ b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile @@ -0,0 +1,69 @@ +# Copyright 2018 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + + +# Install Python Versions from Debian 'testing' repository +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.6 python-all-dev python3-all-dev + +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 + + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile new file mode 100644 index 0000000000..6da3379ed0 --- /dev/null +++ b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile @@ -0,0 +1,69 @@ +# Copyright 2018 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + + +# Install Python Versions from Debian 'testing' repository +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 python-all-dev python3-all-dev + +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 + + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_x64/Dockerfile b/tools/dockerfile/test/python_stretch_x64/Dockerfile deleted file mode 100644 index b325493637..0000000000 --- a/tools/dockerfile/test/python_stretch_x64/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2018 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - - -# Install Python Versions from Debian 'testing' repository -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.5 python3.6 python3.7 python-all-dev python3-all-dev - -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 - - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index a721c67245..86a46c10c9 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -759,8 +759,12 @@ 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', 'python3.7']: - return 'stretch' + if self.args.compiler == 'python3.5': + return 'stretch_35' + elif self.args.compiler == 'python3.6': + return 'stretch_36' + elif self.args.compiler == 'python3.7': + return 'stretch_37' elif self.args.compiler == 'python_alpine': return 'alpine' else: -- cgit v1.2.3 From 772c4c43362736690779eb8d52279a97b5335b6d Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 23 Oct 2018 12:59:22 -0700 Subject: Migrate from `jessie` to `stretch` --- .../tools/dockerfile/apt_get_python_27.include | 3 + .../tools/dockerfile/debian_testing_repo.include | 3 + .../test/python_jessie_x64/Dockerfile.template | 28 ------ .../test/python_pyenv_x64/Dockerfile.template | 29 ------ .../test/python_stretch_27_x64/Dockerfile.template | 24 +++++ .../test/python_stretch_34_x64/Dockerfile.template | 28 ++++++ .../test/python_stretch_35_x64/Dockerfile.template | 7 +- .../test/python_stretch_36_x64/Dockerfile.template | 11 +-- .../test/python_stretch_37_x64/Dockerfile.template | 11 +-- tools/dockerfile/test/python_jessie_x64/Dockerfile | 79 ---------------- tools/dockerfile/test/python_pyenv_x64/Dockerfile | 103 --------------------- .../test/python_stretch_27_x64/Dockerfile | 63 +++++++++++++ .../test/python_stretch_34_x64/Dockerfile | 67 ++++++++++++++ .../test/python_stretch_35_x64/Dockerfile | 9 +- .../test/python_stretch_36_x64/Dockerfile | 12 ++- .../test/python_stretch_37_x64/Dockerfile | 12 ++- tools/run_tests/run_tests.py | 13 ++- 17 files changed, 224 insertions(+), 278 deletions(-) create mode 100644 templates/tools/dockerfile/apt_get_python_27.include create mode 100644 templates/tools/dockerfile/debian_testing_repo.include delete mode 100644 templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template delete mode 100644 tools/dockerfile/test/python_jessie_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_pyenv_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_27_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_34_x64/Dockerfile (limited to 'templates') diff --git a/templates/tools/dockerfile/apt_get_python_27.include b/templates/tools/dockerfile/apt_get_python_27.include new file mode 100644 index 0000000000..c7642d8c79 --- /dev/null +++ b/templates/tools/dockerfile/apt_get_python_27.include @@ -0,0 +1,3 @@ +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 \ No newline at end of file diff --git a/templates/tools/dockerfile/debian_testing_repo.include b/templates/tools/dockerfile/debian_testing_repo.include new file mode 100644 index 0000000000..1a5248e226 --- /dev/null +++ b/templates/tools/dockerfile/debian_testing_repo.include @@ -0,0 +1,3 @@ +# Add Debian 'testing' repository +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 diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template deleted file mode 100644 index e73b839a28..0000000000 --- a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template +++ /dev/null @@ -1,28 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2015 gRPC authors. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - FROM debian:jessie - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../python_deps.include"/> - # 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 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template deleted file mode 100644 index 1e013b742c..0000000000 --- a/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template +++ /dev/null @@ -1,29 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2016 gRPC authors. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../python_deps.include"/> - <%include file="../../apt_get_pyenv.include"/> - # Install pip and virtualenv for Python 3.5 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 - RUN python3.5 -m pip install virtualenv - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template new file mode 100644 index 0000000000..067d68bc37 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template @@ -0,0 +1,24 @@ +%YAML 1.2 +--- | + # Copyright 2018 The gRPC authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + <%include file="../../apt_get_python_27.include"/> + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template new file mode 100644 index 0000000000..6fe4fc4b67 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template @@ -0,0 +1,28 @@ +%YAML 1.2 +--- | + # Copyright 2018 The gRPC authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:stretch + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + <%include file="../../apt_get_python_27.include"/> + + RUN apt-get update && apt-get install -y python3.4 python3-all-dev + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template index 34beaa8a49..e339bb5ced 100644 --- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 gRPC authors. + # Copyright 2018 The gRPC authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,10 +18,9 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../gcp_api_libraries.include"/> + <%include file="../../apt_get_python_27.include"/> - RUN apt-get update && apt-get install -y python2.7 python3.5 python-all-dev python3-all-dev - - RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN apt-get update && apt-get install -y python3.5 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template index cba11a88fd..7db3b7609e 100644 --- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 gRPC authors. + # Copyright 2018 The gRPC authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,13 +18,10 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../gcp_api_libraries.include"/> - - # Install Python Versions from Debian 'testing' repository - 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.6 python-all-dev python3-all-dev + <%include file="../../apt_get_python_27.include"/> + <%include file="../../debian_testing_repo.include"/> - RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template index 9ae0ad14bb..7fb2798029 100644 --- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 gRPC authors. + # Copyright 2018 The gRPC authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,13 +18,10 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../gcp_api_libraries.include"/> - - # Install Python Versions from Debian 'testing' repository - 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 python-all-dev python3-all-dev + <%include file="../../apt_get_python_27.include"/> + <%include file="../../debian_testing_repo.include"/> - RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 <%include file="../../run_tests_addons.include"/> diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile deleted file mode 100644 index a4c3a9f91e..0000000000 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:jessie - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -#==================== -# Python dependencies - -# Install dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -# Install Python packages from PyPI -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 - - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/dockerfile/test/python_pyenv_x64/Dockerfile b/tools/dockerfile/test/python_pyenv_x64/Dockerfile deleted file mode 100644 index d94ccc8c74..0000000000 --- a/tools/dockerfile/test/python_pyenv_x64/Dockerfile +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -#==================== -# Python dependencies - -# Install dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -# Install Python packages from PyPI -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 dependencies for pyenv -RUN apt-get update && apt-get install -y \ - libbz2-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libreadline-dev \ - libsqlite3-dev \ - libssl-dev \ - llvm \ - mercurial \ - zlib1g-dev && apt-get clean - -# Install Pyenv and dev Python versions 3.{5,6,7} -RUN curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash -ENV PATH /root/.pyenv/bin:$PATH -RUN eval "$(pyenv init -)" -RUN eval "$(pyenv virtualenv-init -)" -RUN pyenv update -RUN pyenv install 3.5-dev -RUN pyenv install 3.6-dev -RUN pyenv install 3.7-dev -RUN pyenv install pypy-5.3.1 -RUN pyenv local 3.5-dev 3.6-dev 3.7-dev pypy-5.3.1 - -# Install pip and virtualenv for Python 3.5 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 -RUN python3.5 -m pip install virtualenv - - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile new file mode 100644 index 0000000000..cd7a08ef2e --- /dev/null +++ b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile @@ -0,0 +1,63 @@ +# Copyright 2018 The gRPC authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile new file mode 100644 index 0000000000..ed8fc93bef --- /dev/null +++ b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile @@ -0,0 +1,67 @@ +# Copyright 2018 The gRPC authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +RUN apt-get update && apt-get install -y python3.4 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 + + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile index fa4d3b820f..a42e3bf172 100644 --- a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 gRPC authors. +# Copyright 2018 The gRPC authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -53,10 +53,11 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y python-pip && apt-get clean RUN pip install --upgrade google-api-python-client oauth2client - -RUN apt-get update && apt-get install -y python2.7 python3.5 python-all-dev python3-all-dev - +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +RUN apt-get update && apt-get install -y python3.5 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile index 988ecd9bf6..d028af611d 100644 --- a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 gRPC authors. +# Copyright 2018 The gRPC authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -53,13 +53,15 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y python-pip && apt-get clean RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python Versions from Debian 'testing' repository +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Add Debian 'testing' repository 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.6 python-all-dev python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile index 6da3379ed0..bc8ad1130c 100644 --- a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 gRPC authors. +# Copyright 2018 The gRPC authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -53,13 +53,15 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y python-pip && apt-get clean RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python Versions from Debian 'testing' repository +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Add Debian 'testing' repository 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 python-all-dev python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 86a46c10c9..4329557b40 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -759,16 +759,15 @@ class PythonLanguage(object): self.python_manager_name(), _docker_arch_suffix(self.args.arch)) def python_manager_name(self): - if self.args.compiler == 'python3.5': - return 'stretch_35' - elif self.args.compiler == 'python3.6': - return 'stretch_36' - elif self.args.compiler == 'python3.7': - return 'stretch_37' + if self.args.compiler in [ + 'python2.7', 'python3.4', 'python3.5', 'python3.6', 'python3.7' + ]: + return 'stretch_%s' % re.sub(r'\D*', '', self.args.compiler) elif self.args.compiler == 'python_alpine': return 'alpine' else: - return 'jessie' + raise ValueError("No Docker Python manager available for %s" % + self.args.compiler) def _get_pythons(self, args): if args.arch == 'x86': -- cgit v1.2.3 From a8658d919284ed8fac992e7682c0bf9ffb951abe Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 23 Oct 2018 13:29:24 -0700 Subject: Put `jessie` back for Python3.4 * According to `https://packages.debian.org/jessie/python/python3.4` the Python3.4 has security issues. * Debian `stretch` doesn't include Python3.4 packages in their repo --- .../tools/dockerfile/apt_get_python_27.include | 2 +- .../test/python_jessie_x64/Dockerfile.template | 28 ++++++++ tools/dockerfile/test/python_jessie_x64/Dockerfile | 79 ++++++++++++++++++++++ .../test/python_stretch_27_x64/Dockerfile | 1 + .../test/python_stretch_34_x64/Dockerfile | 1 + .../test/python_stretch_35_x64/Dockerfile | 1 + .../test/python_stretch_36_x64/Dockerfile | 1 + .../test/python_stretch_37_x64/Dockerfile | 1 + tools/run_tests/run_tests.py | 5 +- 9 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template create mode 100644 tools/dockerfile/test/python_jessie_x64/Dockerfile (limited to 'templates') diff --git a/templates/tools/dockerfile/apt_get_python_27.include b/templates/tools/dockerfile/apt_get_python_27.include index c7642d8c79..4ee37ef11f 100644 --- a/templates/tools/dockerfile/apt_get_python_27.include +++ b/templates/tools/dockerfile/apt_get_python_27.include @@ -1,3 +1,3 @@ # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 \ No newline at end of file +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template new file mode 100644 index 0000000000..e73b839a28 --- /dev/null +++ b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template @@ -0,0 +1,28 @@ +%YAML 1.2 +--- | + # Copyright 2015 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM debian:jessie + + <%include file="../../apt_get_basic.include"/> + <%include file="../../gcp_api_libraries.include"/> + <%include file="../../python_deps.include"/> + # 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 + + <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile new file mode 100644 index 0000000000..a4c3a9f91e --- /dev/null +++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile @@ -0,0 +1,79 @@ +# Copyright 2015 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:jessie + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +#==================== +# Python dependencies + +# Install dependencies + +RUN apt-get update && apt-get install -y \ + python-all-dev \ + python3-all-dev \ + python-pip + +# Install Python packages from PyPI +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 + + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile index cd7a08ef2e..f24deea7b1 100644 --- a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile @@ -57,6 +57,7 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN mkdir /var/local/jenkins # Define the default command. diff --git a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile index ed8fc93bef..3a53d85d86 100644 --- a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile @@ -57,6 +57,7 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN apt-get update && apt-get install -y python3.4 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile index a42e3bf172..7235951b64 100644 --- a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile @@ -57,6 +57,7 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + RUN apt-get update && apt-get install -y python3.5 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile index d028af611d..a940e48751 100644 --- a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile @@ -56,6 +56,7 @@ RUN pip install --upgrade google-api-python-client oauth2client # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + # Add Debian 'testing' repository 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 diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile index bc8ad1130c..aba25e7dc3 100644 --- a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile @@ -56,6 +56,7 @@ RUN pip install --upgrade google-api-python-client oauth2client # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + # Add Debian 'testing' repository 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 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 4329557b40..5dcdd3700c 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -760,14 +760,13 @@ class PythonLanguage(object): def python_manager_name(self): if self.args.compiler in [ - 'python2.7', 'python3.4', 'python3.5', 'python3.6', 'python3.7' + 'python2.7', 'python3.5', 'python3.6', 'python3.7' ]: return 'stretch_%s' % re.sub(r'\D*', '', self.args.compiler) elif self.args.compiler == 'python_alpine': return 'alpine' else: - raise ValueError("No Docker Python manager available for %s" % - self.args.compiler) + return 'jessie' def _get_pythons(self, args): if args.arch == 'x86': -- cgit v1.2.3 From b18abf21d6d72acc0bec201f4caef9afd738532c Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 23 Oct 2018 17:18:47 -0700 Subject: Uppercase `Authors` --- .../tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template | 2 +- .../tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template | 2 +- .../tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template | 2 +- .../tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template | 2 +- .../tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template | 2 +- tools/dockerfile/test/python_stretch_27_x64/Dockerfile | 2 +- tools/dockerfile/test/python_stretch_34_x64/Dockerfile | 2 +- tools/dockerfile/test/python_stretch_35_x64/Dockerfile | 2 +- tools/dockerfile/test/python_stretch_36_x64/Dockerfile | 2 +- tools/dockerfile/test/python_stretch_37_x64/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'templates') diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template index 067d68bc37..a371929330 100644 --- a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 The gRPC authors + # Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template index 6fe4fc4b67..43ac7025af 100644 --- a/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 The gRPC authors + # Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template index e339bb5ced..e313db754a 100644 --- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 The gRPC authors + # Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template index 7db3b7609e..ce6a4b3726 100644 --- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 The gRPC authors + # Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template index 7fb2798029..9901e8a6ba 100644 --- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2018 The gRPC authors + # Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile index f24deea7b1..0cd873454f 100644 --- a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 The gRPC authors +# Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile index 3a53d85d86..f73a12f996 100644 --- a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 The gRPC authors +# Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile index 7235951b64..a534467c8b 100644 --- a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 The gRPC authors +# Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile index a940e48751..d64a96d956 100644 --- a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 The gRPC authors +# Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile index aba25e7dc3..843a68ee64 100644 --- a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 The gRPC authors +# Copyright 2018 The gRPC Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -- cgit v1.2.3 From a82ba64943e2a25abd967a0096df31b0bb0ad0b0 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 23 Oct 2018 19:48:24 -0700 Subject: Pack templates into a concentrated one --- templates/tools/dockerfile/python_stretch.include | 9 +++ .../test/python_stretch_27_x64/Dockerfile.template | 11 +--- .../test/python_stretch_34_x64/Dockerfile.template | 28 --------- .../test/python_stretch_35_x64/Dockerfile.template | 14 +---- .../test/python_stretch_36_x64/Dockerfile.template | 13 +---- .../test/python_stretch_37_x64/Dockerfile.template | 13 +---- .../test/python_stretch_27_x64/Dockerfile | 7 ++- .../test/python_stretch_34_x64/Dockerfile | 68 ---------------------- .../test/python_stretch_35_x64/Dockerfile | 12 ++-- .../test/python_stretch_36_x64/Dockerfile | 10 ++-- .../test/python_stretch_37_x64/Dockerfile | 10 ++-- 11 files changed, 42 insertions(+), 153 deletions(-) create mode 100644 templates/tools/dockerfile/python_stretch.include delete mode 100644 templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template delete mode 100644 tools/dockerfile/test/python_stretch_34_x64/Dockerfile (limited to 'templates') diff --git a/templates/tools/dockerfile/python_stretch.include b/templates/tools/dockerfile/python_stretch.include new file mode 100644 index 0000000000..45bafe5184 --- /dev/null +++ b/templates/tools/dockerfile/python_stretch.include @@ -0,0 +1,9 @@ +FROM debian:stretch + +<%include file="./apt_get_basic.include"/> +<%include file="./gcp_api_libraries.include"/> +<%include file="./apt_get_python_27.include"/> +<%include file="./debian_testing_repo.include"/> +<%include file="./run_tests_addons.include"/> +# Define the default command. +CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template index a371929330..a1c9d9f84d 100644 --- a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template @@ -13,12 +13,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../apt_get_python_27.include"/> - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] + + <%include file="../../python_stretch.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template deleted file mode 100644 index 43ac7025af..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template +++ /dev/null @@ -1,28 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 The gRPC Authors - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../apt_get_python_27.include"/> - - RUN apt-get update && apt-get install -y python3.4 python3-all-dev - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template index e313db754a..93b655ea0d 100644 --- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template @@ -13,16 +13,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../apt_get_python_27.include"/> - + + <%include file="../../python_stretch.include"/> + RUN apt-get update && apt-get install -y python3.5 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template index ce6a4b3726..a5dcf196f2 100644 --- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template @@ -13,17 +13,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../apt_get_python_27.include"/> - <%include file="../../debian_testing_repo.include"/> + + <%include file="../../python_stretch.include"/> RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template index 9901e8a6ba..ff342db493 100644 --- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template @@ -13,17 +13,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - FROM debian:stretch - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../apt_get_python_27.include"/> - <%include file="../../debian_testing_repo.include"/> + + <%include file="../../python_stretch.include"/> RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile index 0cd873454f..a7a8174db4 100644 --- a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM debian:stretch - + # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ @@ -57,8 +57,13 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Add Debian 'testing' repository +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 mkdir /var/local/jenkins # Define the default command. CMD ["bash"] + diff --git a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile b/tools/dockerfile/test/python_stretch_34_x64/Dockerfile deleted file mode 100644 index f73a12f996..0000000000 --- a/tools/dockerfile/test/python_stretch_34_x64/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2018 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python 2.7 -RUN apt-get update && apt-get install -y python2.7 python-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - - -RUN apt-get update && apt-get install -y python3.4 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 - - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile index a534467c8b..0e97e77e2f 100644 --- a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM debian:stretch - + # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ @@ -57,12 +57,16 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - -RUN apt-get update && apt-get install -y python3.5 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 +# Add Debian 'testing' repository +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 mkdir /var/local/jenkins # Define the default command. CMD ["bash"] + + +RUN apt-get update && apt-get install -y python3.5 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile index d64a96d956..9b16b2d3a1 100644 --- a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM debian:stretch - + # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ @@ -62,11 +62,11 @@ RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources. RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local -RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - - RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] + + +RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile index 843a68ee64..add1cc509d 100644 --- a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM debian:stretch - + # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ @@ -62,11 +62,11 @@ RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources. RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local -RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 - - RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] + + +RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 -- cgit v1.2.3 From a62344e56ab43a0fa9fd382e7e465751261b4a39 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 23 Oct 2018 20:01:17 -0700 Subject: Rename the Dockerfiles --- .../python_stretch_2.7_x64/Dockerfile.template | 17 +++++ .../test/python_stretch_27_x64/Dockerfile.template | 17 ----- .../python_stretch_3.5_x64/Dockerfile.template | 20 ++++++ .../python_stretch_3.6_x64/Dockerfile.template | 20 ++++++ .../python_stretch_3.7_x64/Dockerfile.template | 20 ++++++ .../test/python_stretch_35_x64/Dockerfile.template | 20 ------ .../test/python_stretch_36_x64/Dockerfile.template | 20 ------ .../test/python_stretch_37_x64/Dockerfile.template | 20 ------ .../test/python_stretch_2.7_x64/Dockerfile | 69 +++++++++++++++++++++ .../test/python_stretch_27_x64/Dockerfile | 69 --------------------- .../test/python_stretch_3.5_x64/Dockerfile | 72 ++++++++++++++++++++++ .../test/python_stretch_3.6_x64/Dockerfile | 72 ++++++++++++++++++++++ .../test/python_stretch_3.7_x64/Dockerfile | 72 ++++++++++++++++++++++ .../test/python_stretch_35_x64/Dockerfile | 72 ---------------------- .../test/python_stretch_36_x64/Dockerfile | 72 ---------------------- .../test/python_stretch_37_x64/Dockerfile | 72 ---------------------- tools/run_tests/run_tests.py | 2 +- 17 files changed, 363 insertions(+), 363 deletions(-) create mode 100644 templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template create mode 100644 tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_stretch_27_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile create mode 100644 tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_stretch_35_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_stretch_36_x64/Dockerfile delete mode 100644 tools/dockerfile/test/python_stretch_37_x64/Dockerfile (limited to 'templates') diff --git a/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template new file mode 100644 index 0000000000..a1c9d9f84d --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template @@ -0,0 +1,17 @@ +%YAML 1.2 +--- | + # Copyright 2018 The gRPC Authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + <%include file="../../python_stretch.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template deleted file mode 100644 index a1c9d9f84d..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 The gRPC Authors - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - <%include file="../../python_stretch.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template new file mode 100644 index 0000000000..93b655ea0d --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template @@ -0,0 +1,20 @@ +%YAML 1.2 +--- | + # Copyright 2018 The gRPC Authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + <%include file="../../python_stretch.include"/> + + RUN apt-get update && apt-get install -y python3.5 python3-all-dev + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template new file mode 100644 index 0000000000..a5dcf196f2 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template @@ -0,0 +1,20 @@ +%YAML 1.2 +--- | + # Copyright 2018 The gRPC Authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + <%include file="../../python_stretch.include"/> + + RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 diff --git a/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template new file mode 100644 index 0000000000..ff342db493 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template @@ -0,0 +1,20 @@ +%YAML 1.2 +--- | + # Copyright 2018 The gRPC Authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + <%include file="../../python_stretch.include"/> + + RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev + RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template deleted file mode 100644 index 93b655ea0d..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template +++ /dev/null @@ -1,20 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 The gRPC Authors - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - <%include file="../../python_stretch.include"/> - - RUN apt-get update && apt-get install -y python3.5 python3-all-dev - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template deleted file mode 100644 index a5dcf196f2..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template +++ /dev/null @@ -1,20 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 The gRPC Authors - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - <%include file="../../python_stretch.include"/> - - RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template deleted file mode 100644 index ff342db493..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template +++ /dev/null @@ -1,20 +0,0 @@ -%YAML 1.2 ---- | - # Copyright 2018 The gRPC Authors - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - <%include file="../../python_stretch.include"/> - - RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 diff --git a/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile new file mode 100644 index 0000000000..a7a8174db4 --- /dev/null +++ b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile @@ -0,0 +1,69 @@ +# Copyright 2018 The gRPC Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +# Add Debian 'testing' repository +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 mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] + diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_27_x64/Dockerfile deleted file mode 100644 index a7a8174db4..0000000000 --- a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2018 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python 2.7 -RUN apt-get update && apt-get install -y python2.7 python-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - -# Add Debian 'testing' repository -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 mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] - diff --git a/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile new file mode 100644 index 0000000000..0e97e77e2f --- /dev/null +++ b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile @@ -0,0 +1,72 @@ +# Copyright 2018 The gRPC Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +# Add Debian 'testing' repository +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 mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] + + +RUN apt-get update && apt-get install -y python3.5 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile new file mode 100644 index 0000000000..9b16b2d3a1 --- /dev/null +++ b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile @@ -0,0 +1,72 @@ +# Copyright 2018 The gRPC Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +# Add Debian 'testing' repository +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 mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] + + +RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 diff --git a/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile new file mode 100644 index 0000000000..add1cc509d --- /dev/null +++ b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile @@ -0,0 +1,72 @@ +# Copyright 2018 The gRPC Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM debian:stretch + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client oauth2client + +# Install Python 2.7 +RUN apt-get update && apt-get install -y python2.7 python-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 + +# Add Debian 'testing' repository +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 mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] + + +RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_35_x64/Dockerfile deleted file mode 100644 index 0e97e77e2f..0000000000 --- a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2018 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python 2.7 -RUN apt-get update && apt-get install -y python2.7 python-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - -# Add Debian 'testing' repository -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 mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] - - -RUN apt-get update && apt-get install -y python3.5 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5 diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_36_x64/Dockerfile deleted file mode 100644 index 9b16b2d3a1..0000000000 --- a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2018 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python 2.7 -RUN apt-get update && apt-get install -y python2.7 python-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - -# Add Debian 'testing' repository -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 mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] - - -RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_37_x64/Dockerfile deleted file mode 100644 index add1cc509d..0000000000 --- a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2018 The gRPC Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:stretch - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -# Install Python 2.7 -RUN apt-get update && apt-get install -y python2.7 python-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 - -# Add Debian 'testing' repository -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 mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] - - -RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 5dcdd3700c..b7ed529762 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -762,7 +762,7 @@ class PythonLanguage(object): if self.args.compiler in [ 'python2.7', 'python3.5', 'python3.6', 'python3.7' ]: - return 'stretch_%s' % re.sub(r'\D*', '', self.args.compiler) + return 'stretch_' + self.args.compiler[len('python'):] elif self.args.compiler == 'python_alpine': return 'alpine' else: -- cgit v1.2.3