From e58f0129d22b0b161cbee73d47b29fd27f613504 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 9 Nov 2020 15:42:14 +0100 Subject: [PATCH 1/2] Stop relying on rbe-windows-credentials.json --- tools/internal_ci/windows/bazel_rbe.bat | 2 +- tools/internal_ci/windows/grpc_bazel_rbe_dbg.cfg | 1 - tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg | 1 - tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg | 1 - tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/internal_ci/windows/bazel_rbe.bat b/tools/internal_ci/windows/bazel_rbe.bat index 0ba0dc9709d..a878434a16e 100644 --- a/tools/internal_ci/windows/bazel_rbe.bat +++ b/tools/internal_ci/windows/bazel_rbe.bat @@ -24,7 +24,7 @@ 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%" %BAZEL_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 //test/... set BAZEL_EXITCODE=%errorlevel% if not "%UPLOAD_TEST_RESULTS%"=="" ( diff --git a/tools/internal_ci/windows/grpc_bazel_rbe_dbg.cfg b/tools/internal_ci/windows/grpc_bazel_rbe_dbg.cfg index 6e7fdc8e6f7..d13b36aac9b 100644 --- a/tools/internal_ci/windows/grpc_bazel_rbe_dbg.cfg +++ b/tools/internal_ci/windows/grpc_bazel_rbe_dbg.cfg @@ -21,7 +21,6 @@ timeout_mins: 90 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, diff --git a/tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg b/tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg index b1a1de06666..87cc3792ee4 100644 --- a/tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg +++ b/tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg @@ -21,7 +21,6 @@ timeout_mins: 90 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, diff --git a/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg b/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg index 7735f764237..116afeb7830 100644 --- a/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg +++ b/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg @@ -21,7 +21,6 @@ timeout_mins: 90 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, diff --git a/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg b/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg index df171480449..b4750e18b33 100644 --- a/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg +++ b/tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg @@ -21,7 +21,6 @@ timeout_mins: 90 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, From a8f7b2d005518a9c8efa364343bfae9537c60a1c Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 9 Nov 2020 15:49:15 +0100 Subject: [PATCH 2/2] stop using GrpcTesting-d0eeee2db331.json for RBE authentication on linux --- tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh | 1 - tools/internal_ci/linux/grpc_bazel_rbe_asan.cfg | 1 - tools/internal_ci/linux/grpc_bazel_rbe_dbg.cfg | 1 - tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.cfg | 1 - tools/internal_ci/linux/grpc_bazel_rbe_msan.cfg | 1 - tools/internal_ci/linux/grpc_bazel_rbe_opt.cfg | 1 - tools/internal_ci/linux/grpc_bazel_rbe_tsan.cfg | 1 - tools/internal_ci/linux/grpc_bazel_rbe_ubsan.cfg | 1 - tools/internal_ci/linux/pull_request/grpc_bazel_rbe_asan.cfg | 1 - tools/internal_ci/linux/pull_request/grpc_bazel_rbe_dbg.cfg | 1 - tools/internal_ci/linux/pull_request/grpc_bazel_rbe_msan.cfg | 1 - tools/internal_ci/linux/pull_request/grpc_bazel_rbe_opt.cfg | 1 - tools/internal_ci/linux/pull_request/grpc_bazel_rbe_tsan.cfg | 1 - tools/internal_ci/linux/pull_request/grpc_bazel_rbe_ubsan.cfg | 1 - 14 files changed, 14 deletions(-) diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh index 5a358acc09d..d5b38de3b51 100755 --- a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh @@ -34,7 +34,6 @@ tools/bazel \ test \ --invocation_id="${BAZEL_INVOCATION_ID}" \ --workspace_status_command=tools/remote_build/workspace_status_kokoro.sh \ - --google_credentials="${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json" \ $@ \ -- //test/... || FAILED="true" diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_asan.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_asan.cfg index abfc486629e..4ed1036bbba 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_asan.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_asan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_asan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_dbg.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_dbg.cfg index 607b2e53081..4af3b7e7672 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_dbg.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_dbg.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.cfg index fdd7324ffc8..172cc158539 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_msan.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_msan.cfg index 98036473a0c..88776701cb7 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_msan.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_msan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_msan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_opt.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_opt.cfg index e34e04111dd..615536cd235 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_opt.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_opt.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_tsan.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_tsan.cfg index 4877981093a..92852ff1b86 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_tsan.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_tsan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_tsan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/grpc_bazel_rbe_ubsan.cfg b/tools/internal_ci/linux/grpc_bazel_rbe_ubsan.cfg index 1c72b91a00a..21cdbff44a2 100644 --- a/tools/internal_ci/linux/grpc_bazel_rbe_ubsan.cfg +++ b/tools/internal_ci/linux/grpc_bazel_rbe_ubsan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/grpc_ubsan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_asan.cfg b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_asan.cfg index b8aada2cdec..5c794b8ae24 100644 --- a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_asan.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_asan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_asan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_dbg.cfg b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_dbg.cfg index 38efccf7780..c1aaf0c2e82 100644 --- a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_dbg.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_dbg.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_bazel_on_foundry_dbg.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_msan.cfg b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_msan.cfg index 14b97b642cf..078a6ae618d 100644 --- a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_msan.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_msan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_msan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_opt.cfg b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_opt.cfg index f352113d946..cc6173dcfed 100644 --- a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_opt.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_opt.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_bazel_on_foundry_opt.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_tsan.cfg b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_tsan.cfg index 993024fb111..1b595b261df 100644 --- a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_tsan.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_tsan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_tsan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting { diff --git a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_ubsan.cfg b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_ubsan.cfg index 282aa55e950..b81692e8471 100644 --- a/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_ubsan.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_bazel_rbe_ubsan.cfg @@ -18,7 +18,6 @@ build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_ubsan_on_foundry.sh" timeout_mins: 90 -gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key" bazel_setting {