Merge remote-tracking branch 'upstream/master' into spiffe1

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
 

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",

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%

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
 ```
 
 Available command line options can be found in

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

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