Merge pull request #24871 from jtattermusch/backport_24831

Backport #24831 to v1.34.x (to fix interop tests build)

templates/tools/dockerfile/go_build_interop.sh.include

@@ -16,14 +16,14 @@
 # Builds Go interop server and client in a base image.
 set -e
 
+# Turn on support for Go modules.
+export GO111MODULE=on
+
 # Clone just the grpc-go source code without any dependencies.
 # We are cloning from a local git repo that contains the right revision
 # to test instead of using "go get" to download from Github directly.
 git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
 
-# Get all gRPC Go dependencies
-(cd src/google.golang.org/grpc && make deps && make testdeps)
-
 # copy service account keys if available
 cp -r /var/local/jenkins/service_account $HOME || true
 

templates/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile.template

@@ -1,23 +0,0 @@
-%YAML 1.2
---- |
-  # Copyright 2017 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 golang:1.7
-  
-  <%include file="../../go_path.include"/>
-  <%include file="../../python_deps.include"/>
-  # Define the default command.
-  CMD ["bash"]
-  

templates/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh.template

@@ -1,3 +0,0 @@
-%YAML 1.2
---- |
-  <%include file="../../go_build_interop.sh.include"/>  

templates/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh.template

@@ -1,3 +0,0 @@
-%YAML 1.2
---- |
-  <%include file="../../go_build_interop.sh.include"/>  

tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh

@@ -16,14 +16,14 @@
 # Builds Go interop server and client in a base image.
 set -e
 
+# Turn on support for Go modules.
+export GO111MODULE=on
+
 # Clone just the grpc-go source code without any dependencies.
 # We are cloning from a local git repo that contains the right revision
 # to test instead of using "go get" to download from Github directly.
 git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
 
-# Get all gRPC Go dependencies
-(cd src/google.golang.org/grpc && make deps && make testdeps)
-
 # copy service account keys if available
 cp -r /var/local/jenkins/service_account $HOME || true
 

tools/dockerfile/interoptest/grpc_interop_go1.11/build_interop.sh

@@ -16,14 +16,14 @@
 # Builds Go interop server and client in a base image.
 set -e
 
+# Turn on support for Go modules.
+export GO111MODULE=on
+
 # Clone just the grpc-go source code without any dependencies.
 # We are cloning from a local git repo that contains the right revision
 # to test instead of using "go get" to download from Github directly.
 git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
 
-# Get all gRPC Go dependencies
-(cd src/google.golang.org/grpc && make deps && make testdeps)
-
 # copy service account keys if available
 cp -r /var/local/jenkins/service_account $HOME || true
 

tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile

@@ -1,37 +0,0 @@
-# Copyright 2017 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 golang:1.7
-
-# Using login shell removes Go from path, so we add it.
-RUN ln -s /usr/local/go/bin/go /usr/local/bin
-
-#====================
-# Python dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y \
-    python-all-dev \
-    python3-all-dev \
-    python-setuptools
-
-# Install Python packages from PyPI
-RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
-RUN pip install --upgrade pip==19.3.1
-RUN pip install virtualenv==16.7.9
-RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0
-
-# Define the default command.
-CMD ["bash"]

tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# Builds Go interop server and client in a base image.
-set -e
-
-# Clone just the grpc-go source code without any dependencies.
-# We are cloning from a local git repo that contains the right revision
-# to test instead of using "go get" to download from Github directly.
-git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
-
-# Get all gRPC Go dependencies
-(cd src/google.golang.org/grpc && make deps && make testdeps)
-
-# copy service account keys if available
-cp -r /var/local/jenkins/service_account $HOME || true
-
-# Build the interop client and server
-(cd src/google.golang.org/grpc/interop/client && go install)
-(cd src/google.golang.org/grpc/interop/server && go install)
-  

tools/run_tests/run_interop_tests.py

@@ -331,7 +331,7 @@ class GoLanguage:
         return ['go', 'run', 'server.go'] + args
 
     def global_env(self):
-        return {}
+        return {'GO111MODULE': 'on'}
 
     def unimplemented_test_cases(self):
         return _SKIP_COMPRESSION