set $build/goma["use_luci_auth"] = True

without use_luci_auth=true, goma will use global service account,
which uses exported service account key.

use task service account by use_luci_auth=true instead.
dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com
dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com
are added to goma-rbe-chromium c-i-a group
https://chrome-infra-auth.appspot.com/auth/groups/goma-rbe-chromium

Bug: chromium:1105814
Change-Id: Ibb510144e36a1b1ae31a97d0c8be1e4424d72b24
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/94902
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Fumitoshi Ukai 2022-06-29 10:30:06 +00:00 committed by Dawn LUCI CQ
parent c64ca23d94
commit f1060adbca
3 changed files with 23 additions and 22 deletions

View File

@ -20,7 +20,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
properties_j: "gen_fuzz_corpus:true" properties_j: "gen_fuzz_corpus:true"
@ -42,7 +42,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
properties_j: "target_cpu:\"x64\"" properties_j: "target_cpu:\"x64\""
@ -63,7 +63,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
properties_j: "target_cpu:\"x86\"" properties_j: "target_cpu:\"x86\""
@ -84,7 +84,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
properties_j: "target_cpu:\"x64\"" properties_j: "target_cpu:\"x64\""
@ -105,7 +105,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
properties_j: "target_cpu:\"x86\"" properties_j: "target_cpu:\"x86\""
@ -126,7 +126,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
properties_j: "target_cpu:\"x64\"" properties_j: "target_cpu:\"x64\""
@ -151,7 +151,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
properties_j: "target_cpu:\"x64\"" properties_j: "target_cpu:\"x64\""
@ -176,7 +176,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
properties_j: "target_cpu:\"x64\"" properties_j: "target_cpu:\"x64\""
@ -201,7 +201,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
properties_j: "target_cpu:\"x86\"" properties_j: "target_cpu:\"x86\""
@ -226,7 +226,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
properties_j: "target_cpu:\"x64\"" properties_j: "target_cpu:\"x64\""
@ -251,7 +251,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
properties_j: "target_cpu:\"x86\"" properties_j: "target_cpu:\"x86\""
@ -332,7 +332,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
@ -354,7 +354,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
@ -376,7 +376,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
@ -398,7 +398,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
@ -420,7 +420,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
@ -446,7 +446,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
@ -492,7 +492,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
@ -518,7 +518,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:true" properties_j: "debug:true"
@ -544,7 +544,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"
@ -570,7 +570,7 @@ buckets {
name: "dawn" name: "dawn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main" cipd_version: "refs/heads/main"
properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
properties_j: "clang:true" properties_j: "clang:true"
properties_j: "debug:false" properties_j: "debug:false"

View File

@ -7,7 +7,7 @@
name: "dawn" name: "dawn"
access: "group:all" access: "group:all"
lucicfg { lucicfg {
version: "1.30.11" version: "1.31.3"
package_dir: ".." package_dir: ".."
config_dir: "generated" config_dir: "generated"
entry_point: "main.star" entry_point: "main.star"

View File

@ -226,6 +226,7 @@ def get_default_properties(os, clang, debug, cpu, fuzzer):
goma_props.update({ goma_props.update({
"server_host": "goma.chromium.org", "server_host": "goma.chromium.org",
"rpc_extra_params": "?prod", "rpc_extra_params": "?prod",
"use_luci_auth": True,
}) })
if os.category != os_category.MAC: if os.category != os_category.MAC:
goma_props["enable_ats"] = True goma_props["enable_ats"] = True