tint: 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
tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com
tint-try-builder@chops-service-accounts.iam.gserviceaccount.com
are already 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: I35df5165751b3dff7e3767492628fccff931f8d2
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/95740
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index d5dfd32..7217aa1 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -20,7 +20,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:true"
properties_j: "target_cpu:\"x64\""
@@ -41,7 +41,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:true"
properties_j: "target_cpu:\"x86\""
@@ -62,7 +62,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:false"
properties_j: "target_cpu:\"x64\""
@@ -83,7 +83,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:false"
properties_j: "target_cpu:\"x86\""
@@ -104,7 +104,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:true"
properties_j: "target_cpu:\"x64\""
@@ -129,7 +129,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:false"
properties_j: "target_cpu:\"x64\""
@@ -154,7 +154,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:true"
properties_j: "target_cpu:\"x64\""
@@ -179,7 +179,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:true"
properties_j: "target_cpu:\"x86\""
@@ -204,7 +204,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:false"
properties_j: "target_cpu:\"x64\""
@@ -229,7 +229,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "debug:false"
properties_j: "target_cpu:\"x86\""
@@ -310,7 +310,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:true"
@@ -332,7 +332,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:true"
@@ -354,7 +354,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:false"
@@ -376,7 +376,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:false"
@@ -398,7 +398,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:true"
@@ -424,7 +424,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:false"
@@ -470,7 +470,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:true"
@@ -496,7 +496,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:true"
@@ -522,7 +522,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:false"
@@ -548,7 +548,7 @@
name: "tint"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "clang:true"
properties_j: "debug:false"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 59dd096..2929c33 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
name: "tint"
access: "group:all"
lucicfg {
- version: "1.30.9"
+ version: "1.31.4"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index c3f0bce..0f795a9 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -197,6 +197,7 @@
goma_props.update({
"server_host": "goma.chromium.org",
"rpc_extra_params": "?prod",
+ "use_luci_auth": True,
})
if os.category != os_category.MAC:
goma_props["enable_ats"] = True
