From 4c34f8352c0d3f02527297de8f7cc8e23eb1c6a8 Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Tue, 3 Sep 2019 20:09:42 +1000 Subject: [PATCH 1/5] Fix simple typo: avaiable -> available --- doc/server_side_auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/server_side_auth.md b/doc/server_side_auth.md index e425289faa9..5905626fea6 100644 --- a/doc/server_side_auth.md +++ b/doc/server_side_auth.md @@ -2,7 +2,7 @@ Server-side API for Authenticating Clients ========================================== NOTE: This document describes how server-side authentication works in C-core based gRPC implementations only. In gRPC Java and Go, server side authentication is handled differently. -NOTE2: `CallCredentials` class is only valid for secure channels in C-Core. So, for connections under insecure channels, features below might not be avaiable. +NOTE2: `CallCredentials` class is only valid for secure channels in C-Core. So, for connections under insecure channels, features below might not be available. ## AuthContext From e14212b9a5d29ce54f7ad68a66fa2f8c5f05cc12 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 16 Sep 2019 15:26:32 +0200 Subject: [PATCH 2/5] fix windows RBE manual build instructions --- tools/remote_build/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/remote_build/README.md b/tools/remote_build/README.md index 2cd5f03daf1..aa96704f4ca 100644 --- a/tools/remote_build/README.md +++ b/tools/remote_build/README.md @@ -32,7 +32,7 @@ bazel --bazelrc=tools/remote_build/manual.bazelrc test --config=asan //test/... Run on Windows MSVC: ``` # RBE manual run only for c-core (must be run on a Windows host machine) -bazel --bazelrc=tools/remote_build/windows.bazelrc build :all [--credentials_json=(path to service account credentials)] +bazel --bazelrc=tools/remote_build/windows.bazelrc build :all [--google_credentials=(path to service account credentials)] ``` Available command line options can be found in From 4521dea985257deab98f392e420ac73d312201e5 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 16 Sep 2019 15:30:04 +0200 Subject: [PATCH 3/5] try bazel 0.29.1 for windows --- tools/internal_ci/windows/bazel_rbe.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/internal_ci/windows/bazel_rbe.bat b/tools/internal_ci/windows/bazel_rbe.bat index 827952791c9..86dcc74c429 100644 --- a/tools/internal_ci/windows/bazel_rbe.bat +++ b/tools/internal_ci/windows/bazel_rbe.bat @@ -14,8 +14,7 @@ @rem TODO(jtattermusch): make this generate less output @rem TODO(jtattermusch): use tools/bazel script to keep the versions in sync -@rem TODO(jtattermusch): https://github.com/bazelbuild/bazel/issues/9369 prevents upgrade to 0.29.1 -choco install bazel -y --version 0.29.0 --limit-output +choco install bazel -y --version 0.29.1 --limit-output cd github/grpc set PATH=C:\tools\msys64\usr\bin;C:\Python27;%PATH% From 84f555bfd8aefb1b0e12d14b56949bbfbef78d5f Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 16 Sep 2019 16:31:21 +0200 Subject: [PATCH 4/5] simplify and unify manual builds --- tools/remote_build/README.md | 2 +- tools/remote_build/manual.bazelrc | 7 +++---- tools/remote_build/windows.bazelrc | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/remote_build/README.md b/tools/remote_build/README.md index aa96704f4ca..68d68400577 100644 --- a/tools/remote_build/README.md +++ b/tools/remote_build/README.md @@ -32,7 +32,7 @@ bazel --bazelrc=tools/remote_build/manual.bazelrc test --config=asan //test/... Run on Windows MSVC: ``` # RBE manual run only for c-core (must be run on a Windows host machine) -bazel --bazelrc=tools/remote_build/windows.bazelrc build :all [--google_credentials=(path to service account credentials)] +bazel --bazelrc=tools/remote_build/windows.bazelrc build :all ``` Available command line options can be found in diff --git a/tools/remote_build/manual.bazelrc b/tools/remote_build/manual.bazelrc index c3c6af42877..9819a9ffb36 100644 --- a/tools/remote_build/manual.bazelrc +++ b/tools/remote_build/manual.bazelrc @@ -20,11 +20,10 @@ import %workspace%/tools/remote_build/rbe_common.bazelrc build --remote_cache=grpcs://remotebuildexecution.googleapis.com build --remote_executor=grpcs://remotebuildexecution.googleapis.com -# Enable authentication. This will pick up application default credentials by -# default. You can use --auth_credentials=some_file.json to use a service -# account credential instead. +# Enable authentication. Bazel will use application default credentials +# unless overridden by --google_credentials=service_account_credentials.json # How to setup credentials: -# See https://cloud.google.com/remote-build-execution/docs/getting-started#set_credentials +# https://cloud.google.com/remote-build-execution/docs/results-ui/getting-started-results-ui build --auth_enabled=true # Set flags for uploading to BES in order to view results in the Bazel Build diff --git a/tools/remote_build/windows.bazelrc b/tools/remote_build/windows.bazelrc index 825d6765de9..e9b418f9837 100644 --- a/tools/remote_build/windows.bazelrc +++ b/tools/remote_build/windows.bazelrc @@ -3,6 +3,8 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 build --remote_cache=grpcs://remotebuildexecution.googleapis.com build --remote_executor=grpcs://remotebuildexecution.googleapis.com +build --auth_enabled=true + build --host_crosstool_top=//third_party/toolchains/bazel_0.26.0_rbe_windows:toolchain build --crosstool_top=//third_party/toolchains/bazel_0.26.0_rbe_windows:toolchain build --extra_toolchains=//third_party/toolchains/bazel_0.26.0_rbe_windows:cc-toolchain-x64_windows From 7be5d098cf381f366dd7534c22db89aba2f024f3 Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Mon, 16 Sep 2019 13:42:12 -0700 Subject: [PATCH 5/5] Tune xds test --- test/cpp/end2end/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index 9153439341f..3ddd6d68c93 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -486,6 +486,7 @@ grpc_cc_test( grpc_cc_test( name = "xds_end2end_test", + timeout = "long", srcs = ["xds_end2end_test.cc"], external_deps = [ "gtest",