From 4d01188e5ced24e8d61f56d0b18050199d852261 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 1 Dec 2020 11:19:53 +0100 Subject: [PATCH] restore go1.8 image --- .../grpc_interop_go1.8/build_interop.sh.template | 3 --- .../interoptest/grpc_interop_go1.8/build_interop.sh | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 templates/tools/dockerfile/interoptest/grpc_interop_go1.8/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 deleted file mode 100644 index a08798b1d6bea..0000000000000 --- a/templates/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh.template +++ /dev/null @@ -1,3 +0,0 @@ -%YAML 1.2 ---- | - <%include file="../../go_build_interop.sh.include"/> diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh index 309340cb9ed62..b11ace3a4e73e 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_go1.8/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