Merge pull request grpc#24871 from jtattermusch/backport_24831

Backport grpc#24831 to v1.34.x (to fix interop tests build)
javiyt · Dec 1, 2020 · 64c6cfc · 64c6cfc
2 parents e379161 + 4d01188
commit 64c6cfc
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 109 deletions.
diff --git a/templates/tools/dockerfile/go_build_interop.sh.include b/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
 

diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile.template
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh.template b/templates/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh.template
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh.template b/templates/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh.template
diff --git a/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh b/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
 

diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.11/build_interop.sh b/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
 

diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile
diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
@@ -331,7 +331,7 @@ def server_cmd(self, args):
         return ['go', 'run', 'server.go'] + args
 
     def global_env(self):
-        return {}
+        return {'GO111MODULE': 'on'}
 
     def unimplemented_test_cases(self):
         return _SKIP_COMPRESSION