From 995b014904438e224fa6e12356bd99630761111a Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 10 Apr 2019 11:31:16 -0700 Subject: [PATCH] Update aspnetcore interop scripts to use activate.sh --- .../grpc_interop_aspnetcore/build_interop.sh.template | 9 +++------ .../interoptest/grpc_interop_aspnetcore/build_interop.sh | 5 +---- 2 files changed, 4 insertions(+), 10 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 53c5adae0d1..bab5007cee1 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,14 +25,11 @@ 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 - if [ -f $HOME/.dotnet/dotnet ] - then - ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet - fi - + source ./activate.sh + ./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 ce21e0f335d..1e3ae88ccbb 100644 --- a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh @@ -26,10 +26,7 @@ cd /var/local/git/grpc-dotnet # If needed, update dotnet SDK and put it on path ./build/get-dotnet.sh -if [ -f $HOME/.dotnet/dotnet ] -then - ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet -fi +source ./activate.sh ./build/get-grpc.sh