From c24acc3d4a3754fca1a6ac55452b3c5f1a649b68 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 18 Mar 2019 22:29:08 +0100 Subject: [PATCH 1/2] fix grpc-dotnet interop tests --- .../grpc_interop_aspnetcore/build_interop.sh.template | 2 ++ .../interoptest/grpc_interop_aspnetcore/build_interop.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template index 449383c0d6f..4125d712acb 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template @@ -26,6 +26,8 @@ cd /var/local/git/grpc-dotnet ./build/get-dotnet.sh + export PATH="$HOME/.dotnet/:$PATH" + ./build/get-grpc.sh cd testassets/InteropTestsWebsite diff --git a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh index ed82440ba3c..444aec169a1 100644 --- a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh @@ -24,6 +24,8 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc-dotnet ./build/get-dotnet.sh +export PATH="$HOME/.dotnet/:$PATH" + ./build/get-grpc.sh cd testassets/InteropTestsWebsite From 385af3bc61dcb00a2875493a24d02b91edb984dc Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 19 Mar 2019 07:25:23 -0400 Subject: [PATCH 2/2] fixup --- .../grpc_interop_aspnetcore/build_interop.sh.template | 7 ++++++- .../interoptest/grpc_interop_aspnetcore/build_interop.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template index 4125d712acb..53c5adae0d1 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template @@ -25,8 +25,13 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc-dotnet + + # If needed, update dotnet SDK and put it on path ./build/get-dotnet.sh - export PATH="$HOME/.dotnet/:$PATH" + if [ -f $HOME/.dotnet/dotnet ] + then + ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet + fi ./build/get-grpc.sh diff --git a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh index 444aec169a1..ce21e0f335d 100644 --- a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh @@ -23,8 +23,13 @@ git clone /var/local/jenkins/grpc-dotnet /var/local/git/grpc-dotnet cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc-dotnet + +# If needed, update dotnet SDK and put it on path ./build/get-dotnet.sh -export PATH="$HOME/.dotnet/:$PATH" +if [ -f $HOME/.dotnet/dotnet ] +then + ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet +fi ./build/get-grpc.sh