Merge pull request #20489 from jtattermusch/win_rbe_better_config

Windows bazel RBE improvements

tools/internal_ci/windows/bazel_rbe.bat

@@ -24,9 +24,13 @@ powershell -Command "[guid]::NewGuid().ToString()" >%KOKORO_ARTIFACTS_DIR%/bazel
 set /p BAZEL_INVOCATION_ID=<%KOKORO_ARTIFACTS_DIR%/bazel_invocation_ids
 
 @rem TODO(jtattermusch): windows RBE should be able to use the same credentials as Linux RBE.
-bazel --bazelrc=tools/remote_build/windows.bazelrc test --invocation_id="%BAZEL_INVOCATION_ID%" %RUN_TESTS_FLAGS% --workspace_status_command=tools/remote_build/workspace_status_kokoro.bat --google_credentials=%KOKORO_GFILE_DIR%/rbe-windows-credentials.json //test/...
+bazel --bazelrc=tools/remote_build/windows.bazelrc test --invocation_id="%BAZEL_INVOCATION_ID%" %BAZEL_FLAGS% --workspace_status_command=tools/remote_build/workspace_status_kokoro.bat --google_credentials=%KOKORO_GFILE_DIR%/rbe-windows-credentials.json //test/...
 set BAZEL_EXITCODE=%errorlevel%
 
-@rem TODO(jtattermusch): upload results to bigquery
+if not "%UPLOAD_TEST_RESULTS%"=="" (
+  @rem Sleep to let ResultStore finish writing results before querying
+  timeout /t 60 /nobreak
+  python ./tools/run_tests/python_utils/upload_rbe_results.py
+)
 
 exit /b %BAZEL_EXITCODE%

tools/internal_ci/windows/grpc_bazel_rbe_dbg.cfg

@@ -33,7 +33,12 @@ bazel_setting {
 
 env_vars {
   # flags will be passed to bazel invocation by bazel_rbe.bat
-  key: "RUN_TESTS_FLAGS"
+  key: "BAZEL_FLAGS"
   # TODO(jtattermusch): add --config=dbg once that works
   value: "--cache_test_results=no"
 }
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg

@@ -0,0 +1,42 @@
+# Copyright 2019 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Config file for the internal CI (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc/tools/internal_ci/windows/bazel_rbe.bat"
+
+timeout_mins: 60
+
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/rbe-windows-credentials.json"
+
+bazel_setting {
+  # In order for Kokoro to recognize this as a bazel build and publish the bazel resultstore link,
+  # the bazel_setting section needs to be present and "upsalite_frontend_address" needs to be
+  # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
+  # command is invoked).
+  upsalite_frontend_address: "https://source.cloud.google.com"
+}
+
+env_vars {
+  # flags will be passed to bazel invocation by bazel_rbe.bat
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=opt"
+}
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg

@@ -33,7 +33,7 @@ bazel_setting {
 
 env_vars {
   # flags will be passed to bazel invocation by bazel_rbe.bat
-  key: "RUN_TESTS_FLAGS"
+  key: "BAZEL_FLAGS"
   # TODO(jtattermusch): add --config=dbg once that works
   value: ""
 }

tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg

@@ -0,0 +1,38 @@
+# Copyright 2019 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Config file for the internal CI (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc/tools/internal_ci/windows/bazel_rbe.bat"
+
+timeout_mins: 60
+
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/rbe-windows-credentials.json"
+
+bazel_setting {
+  # In order for Kokoro to recognize this as a bazel build and publish the bazel resultstore link,
+  # the bazel_setting section needs to be present and "upsalite_frontend_address" needs to be
+  # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
+  # command is invoked).
+  upsalite_frontend_address: "https://source.cloud.google.com"
+}
+
+env_vars {
+  # flags will be passed to bazel invocation by bazel_rbe.bat
+  key: "BAZEL_FLAGS"
+  value: "--config=opt"
+}