Pack templates into a concentrated one

6 files changed, 18 insertions, 70 deletions

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"]