infra/config: All builders use a task service account for Goma access.

Made all builders to use the task service account to access Goma. I removed options from lib and made use_luci_auth=true mandatory. Bug: crbug.com/1105814 Change-Id: I8c0dff203a96e34db0b5ec1ac79b70289e2ae9e3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2411561Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org> Cr-Commit-Position: refs/heads/master@{#806951}

infra/config: All builders use a task service account for Goma access.
Made all builders to use the task service account to access Goma. I removed options from lib and made use_luci_auth=true mandatory. Bug: crbug.com/1105814 Change-Id: I8c0dff203a96e34db0b5ec1ac79b70289e2ae9e3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2411561Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org> Cr-Commit-Position: refs/heads/master@{#806951}
281923e5 · Yoshisato Yanagisawa · Commit Bot · b3b8b381 · 281923e5 · 281923e5
Commit 281923e5 authored Sep 15, 2020 by Yoshisato Yanagisawa Committed by Commit Bot Sep 15, 2020
6 changed files
--- a/infra/config/generated/cr-buildbucket-dev.cfg
+++ b/infra/config/generated/cr-buildbucket-dev.cfg
@@ -32,7 +32,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }
@@ -59,7 +59,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }
@@ -86,7 +86,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }
@@ -114,7 +114,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }
@@ -141,7 +141,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }
@@ -168,7 +168,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }
@@ -195,7 +195,7 @@ buckets {
        name: "swarming/staging"
        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true}"
        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver-dev.appspot.com\"}"
        properties_j: "builder_group:\"chromium.dev\""
      }

--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -15210,7 +15210,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "luciexe"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
      execution_timeout_secs: 32400
      expiration_secs: 7200
      caches {
@@ -15244,7 +15244,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "luciexe"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
      execution_timeout_secs: 32400
      expiration_secs: 7200
      caches {
@@ -15278,7 +15278,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "luciexe"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
      execution_timeout_secs: 32400
      expiration_secs: 7200
      caches {
@@ -15312,7 +15312,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "luciexe"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
      execution_timeout_secs: 32400
      expiration_secs: 7200
      caches {
@@ -15346,7 +15346,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "luciexe"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
      execution_timeout_secs: 32400
      expiration_secs: 7200
      caches {
@@ -15380,7 +15380,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "luciexe"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
      execution_timeout_secs: 32400
      expiration_secs: 7200
      caches {
@@ -15430,7 +15430,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"recipe\":\"findit/chromium/single_revision\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"recipe\":\"findit/chromium/single_revision\"}"
      execution_timeout_secs: 28800
      caches {
        name: "win_toolchain"
@@ -15454,7 +15454,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"recipe\":\"findit/chromium/compile\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"recipe\":\"findit/chromium/compile\"}"
      execution_timeout_secs: 28800
      caches {
        name: "win_toolchain"
@@ -15479,7 +15479,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"gs_bucket\":\"findit-for-me\",\"gs_object\":\"bot_db.json\",\"recipe\":\"findit/chromium/export_bot_db\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"gs_bucket\":\"findit-for-me\",\"gs_object\":\"bot_db.json\",\"recipe\":\"findit/chromium/export_bot_db\"}"
      execution_timeout_secs: 28800
      caches {
        name: "win_toolchain"
@@ -29491,7 +29491,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29511,7 +29511,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29531,7 +29531,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29551,7 +29551,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29572,7 +29572,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29592,7 +29592,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29612,7 +29612,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29632,7 +29632,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29652,7 +29652,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29672,7 +29672,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc\",\"perf_dashboard_machine_group\":\"ChromiumWebRTC\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29708,7 +29708,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29728,7 +29728,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29748,7 +29748,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29768,7 +29768,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29788,7 +29788,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29808,7 +29808,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29828,7 +29828,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29848,7 +29848,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29869,7 +29869,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11c29\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11c29\"}"
      execution_timeout_secs: 7200
      caches {
        name: "xcode_ios_11c29"
@@ -29894,7 +29894,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11c29\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11c29\"}"
      execution_timeout_secs: 7200
      caches {
        name: "xcode_ios_11c29"
@@ -29918,7 +29918,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11c29\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11c29\"}"
      execution_timeout_secs: 7200
      caches {
        name: "xcode_ios_11c29"
@@ -29942,7 +29942,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29962,7 +29962,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -29982,7 +29982,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -30002,7 +30002,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -30022,7 +30022,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"chromium\"}"
      execution_timeout_secs: 7200
      build_numbers: YES
      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -30042,7 +30042,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"webrtc/chromium_ios\",\"xcode_build_version\":\"12a8189n\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"webrtc/chromium_ios\",\"xcode_build_version\":\"12a8189n\"}"
      execution_timeout_secs: 7200
      caches {
        name: "xcode_ios_12a8189n"
@@ -30066,7 +30066,7 @@ buckets {
        cipd_version: "refs/heads/master"
        cmd: "recipes"
      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"webrtc/chromium_ios\",\"xcode_build_version\":\"12a8189n\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.webrtc.fyi\",\"recipe\":\"webrtc/chromium_ios\",\"xcode_build_version\":\"12a8189n\"}"
      execution_timeout_secs: 7200
      caches {
        name: "xcode_ios_12a8189n"
--- a/infra/config/lib/builders.star
+++ b/infra/config/lib/builders.star
@@ -163,7 +163,7 @@ def _chromium_tests_property(*, bucketed_triggers, project_trigger_overrides):

    return chromium_tests or None

-def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs, goma_use_luci_auth, os):
+def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs, os):
    goma_properties = {}

    goma_backend = defaults.get_value("goma_backend", goma_backend)
@@ -193,11 +193,10 @@ def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs, goma
    if goma_jobs != None:
        goma_properties["jobs"] = goma_jobs

-    goma_use_luci_auth = defaults.get_value("goma_use_luci_auth", goma_use_luci_auth)
-    if goma_use_luci_auth:
-        goma_properties["use_luci_auth"] = True
+    # Builders must use the task service accounts.
+    goma_properties["use_luci_auth"] = True

-    return goma_properties or None
+    return goma_properties

 def _code_coverage_property(
        *,
@@ -264,7 +263,6 @@ defaults = args.defaults(
    goma_debug = False,
    goma_enable_ats = args.COMPUTE,
    goma_jobs = None,
-    goma_use_luci_auth = None,
    os = None,
    project_trigger_overrides = None,
    pool = None,
@@ -309,7 +307,6 @@ def builder(
        goma_debug = args.DEFAULT,
        goma_enable_ats = args.DEFAULT,
        goma_jobs = args.DEFAULT,
-        goma_use_luci_auth = args.DEFAULT,
        use_clang_coverage = args.DEFAULT,
        use_java_coverage = args.DEFAULT,
        coverage_exclude_sources = args.DEFAULT,
@@ -396,9 +393,6 @@ def builder(
        to be used by the builder. Sets the 'jobs' field of the '$build/goma'
        property will be set according to the enum member. By default, the 'jobs'
        considered None.
-      * goma_use_luci_auth - a boolean indicating whether luci_auth should be
-        used for accessing goma backend. If True, the 'use_luci_auth' field
-        will be set in the '$build/goma' property. By default, considered False.
      * use_clang_coverage - a boolean indicating whether clang coverage should be
        used. If True, the 'use_clang_coverage" field will be set in the
        '$build/code_coverage' property. By default, considered False.
@@ -517,7 +511,6 @@ def builder(
        goma_debug = goma_debug,
        goma_enable_ats = goma_enable_ats,
        goma_jobs = goma_jobs,
-        goma_use_luci_auth = goma_use_luci_auth,
        os = os,
    )
    if goma != None:

--- a/infra/config/lib/ci.star
+++ b/infra/config/lib/ci.star
@@ -110,7 +110,6 @@ def set_defaults(milestone_vars, **kwargs):
        service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
        swarming_tags = ["vpython:native-python-wrapper"],
        triggered_by = [milestone_vars.ci_poller],
-        goma_use_luci_auth = True,
    )
    default_values.update(kwargs)
    for k, v in default_values.items():

--- a/infra/config/lib/try.star
+++ b/infra/config/lib/try.star
@@ -121,7 +121,6 @@ def set_defaults(milestone_vars, **kwargs):
        service_account = "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com",
        swarming_tags = ["vpython:native-python-wrapper"],
        task_template_canary_percentage = 5,
-        goma_use_luci_auth = True,
    )
    default_values.update(kwargs)
    for k, v in default_values.items():

--- a/infra/config/subprojects/goma/goma.star
+++ b/infra/config/subprojects/goma/goma.star
@@ -52,7 +52,6 @@ def fyi_goma_canary_builder(*, name, **kwargs):
        name = name,
        builder_group = "chromium.goma.fyi",
        execution_timeout = 10 * time.hour,
-        goma_use_luci_auth = True,
        **kwargs
    )

@@ -156,7 +155,6 @@ def fyi_goma_rbe_canary_builder(
        execution_timeout = 10 * time.hour,
        goma_backend = goma_backend,
        os = os,
-        goma_use_luci_auth = True,
        **kwargs
    )

@@ -217,7 +215,6 @@ def fyi_goma_latest_client_builder(*, name, os = os.LINUX_DEFAULT, **kwargs):
        builder_group = "chromium.goma.fyi",
        execution_timeout = 10 * time.hour,
        os = os,
-        goma_use_luci_auth = True,
        **kwargs
    )

@@ -318,7 +315,6 @@ def fyi_goma_rbe_latest_client_builder(
        execution_timeout = 10 * time.hour,
        goma_backend = goma_backend,
        os = os,
-        goma_use_luci_auth = True,
        **kwargs
    )

@@ -398,7 +394,6 @@ def goma_builder(
        builder_group = "chromium.goma",
        builderless = builderless,
        os = os,
-        goma_use_luci_auth = True,
        **kwargs
    )