Update aspnetcore interop scripts to use activate.sh

6 years ago · 2ec339d4c9
parent 8054a731d1
commit 2ec339d4c9
2 changed files with 4 additions and 10 deletions
--- 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
--- 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