Python virtualenv dockerfile cleanup (#31139)

* python tests install pinned virtualenv themselves

* more alpine image simplifications

* regenerate alpine image

* introduce dockerfile template for xds interop tests harness deps

* cleanup interop_http2 docker image, remove python_deps.include

templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template

@@ -17,7 +17,14 @@
   FROM golang:latest
   
   <%include file="../../go_path.include"/>
-  <%include file="../../python_deps.include"/>
+
+  # Dependencies to run http2_test_server.py
+  RUN apt-get update && apt-get install -y python3-all-dev python3-pip
+  # pip packages needed to run http2_test_server.py
+  # TODO(jtattermusch): revisit which pip packages are actually needed to run http2 interop server/client
+  RUN python3 -m pip install --upgrade pip==19.3.1
+  RUN python3 -m pip install futures==3.1.1 enum34==1.1.10 protobuf==3.5.2.post1 six==1.16.0
+
   RUN python3 -m pip install twisted h2==2.6.1 hyper
 
   # Define the default command.

templates/tools/dockerfile/python_deps.include

@@ -1,11 +0,0 @@
-#====================
-# Python dependencies to run tools/run_tests scripts
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y python3-all-dev python3-pip
-
-# Install Python packages from PyPI
-RUN python3 -m pip install --upgrade pip==19.3.1
-RUN python3 -m pip install virtualenv==16.7.9
-RUN python3 -m pip install futures==3.1.1 enum34==1.1.10 protobuf==3.5.2.post1 six==1.16.0 twisted==19.10.0

templates/tools/dockerfile/test/php73_zts_debian11_x64/Dockerfile.template

@@ -38,9 +38,7 @@
   <%include file="../../cmake.include"/>
   <%include file="../../ccache.include"/>
   <%include file="../../run_tests_addons.include"/>
-
-  # Seems required by XDS interop tests.
-  RUN python3 -m pip install virtualenv==16.7.9
+  <%include file="../../xds_interop_deps.include"/>
 
   # Define the default command.
   CMD ["bash"]

templates/tools/dockerfile/test/python_alpine_x64/Dockerfile.template

@@ -43,8 +43,6 @@
 
   # Install Python packages from PyPI
   RUN python3 -m pip install --upgrade pip==19.3.1
-  RUN python3 -m pip install virtualenv
-  RUN python3 -m pip install futures==3.1.1 enum34==1.1.10 protobuf==3.5.2.post1 six==1.16.0
 
   <%include file="../../gcp_api_libraries.include"/>
 

templates/tools/dockerfile/test/ruby_debian11_arm64/Dockerfile.template

@@ -22,9 +22,7 @@
   <%include file="../../cmake.include"/>
   <%include file="../../ccache.include"/>
   <%include file="../../run_tests_addons.include"/>
-
-  # Seems required by XDS interop tests.
-  RUN python3 -m pip install virtualenv==16.7.9
+  <%include file="../../xds_interop_deps.include"/>
 
   # Define the default command.
   CMD ["bash"]

templates/tools/dockerfile/test/ruby_debian11_x64/Dockerfile.template

@@ -22,9 +22,7 @@
   <%include file="../../cmake.include"/>
   <%include file="../../ccache.include"/>
   <%include file="../../run_tests_addons.include"/>
-
-  # Seems required by XDS interop tests.
-  RUN python3 -m pip install virtualenv==16.7.9
+  <%include file="../../xds_interop_deps.include"/>
 
   # Define the default command.
   CMD ["bash"]

templates/tools/dockerfile/xds_interop_deps.include

@@ -0,0 +1,2 @@
+# Required by XDS interop test harness.
+RUN python3 -m pip install virtualenv==16.7.9

tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile

@@ -17,17 +17,13 @@ FROM golang:latest
 # Using login shell removes Go from path, so we add it.
 RUN ln -s /usr/local/go/bin/go /usr/local/bin
 
-#====================
-# Python dependencies to run tools/run_tests scripts
-
-# Install dependencies
 
+# Dependencies to run http2_test_server.py
 RUN apt-get update && apt-get install -y python3-all-dev python3-pip
-
-# Install Python packages from PyPI
+# pip packages needed to run http2_test_server.py
+# TODO(jtattermusch): revisit which pip packages are actually needed to run http2 interop server/client
 RUN python3 -m pip install --upgrade pip==19.3.1
-RUN python3 -m pip install virtualenv==16.7.9
-RUN python3 -m pip install futures==3.1.1 enum34==1.1.10 protobuf==3.5.2.post1 six==1.16.0 twisted==19.10.0
+RUN python3 -m pip install futures==3.1.1 enum34==1.1.10 protobuf==3.5.2.post1 six==1.16.0
 
 RUN python3 -m pip install twisted h2==2.6.1 hyper
 

tools/dockerfile/test/php73_zts_debian11_x64/Dockerfile

@@ -83,9 +83,9 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
 
 RUN mkdir /var/local/jenkins
 
-
-# Seems required by XDS interop tests.
+# Required by XDS interop test harness.
 RUN python3 -m pip install virtualenv==16.7.9
 
+
 # Define the default command.
 CMD ["bash"]

tools/dockerfile/test/python_alpine_x64/Dockerfile

@@ -22,8 +22,6 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 
 # Install Python packages from PyPI
 RUN python3 -m pip install --upgrade pip==19.3.1
-RUN python3 -m pip install virtualenv
-RUN python3 -m pip install futures==3.1.1 enum34==1.1.10 protobuf==3.5.2.post1 six==1.16.0
 
 # Google Cloud Platform API libraries
 # These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts)

tools/dockerfile/test/ruby_debian11_arm64/Dockerfile

@@ -118,9 +118,9 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
 
 RUN mkdir /var/local/jenkins
 
-
-# Seems required by XDS interop tests.
+# Required by XDS interop test harness.
 RUN python3 -m pip install virtualenv==16.7.9
 
+
 # Define the default command.
 CMD ["bash"]

tools/dockerfile/test/ruby_debian11_x64/Dockerfile

@@ -118,9 +118,9 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
 
 RUN mkdir /var/local/jenkins
 
-
-# Seems required by XDS interop tests.
+# Required by XDS interop test harness.
 RUN python3 -m pip install virtualenv==16.7.9
 
+
 # Define the default command.
 CMD ["bash"]