Merge pull request #18421 from jtattermusch/fix_grpc_dotnet_interop

Fix grpc-dotnet interop tests
6 years ago · 4c4a20b2f2
parent 9c29708896 385af3bc61
commit 4c4a20b2f2
2 changed files with 14 additions and 0 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,7 +25,14 @@
  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
+  
  ./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
@ -23,7 +23,14 @@ 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
+if [ -f $HOME/.dotnet/dotnet ]
+then
+  ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
+fi
+
 ./build/get-grpc.sh

 cd testassets/InteropTestsWebsite