Commit 824b4e64 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Commit Bot

Revert "Enable task service account on builders using "chromium-ci-builder@""

This reverts commit 012f9ce6.

Reason for revert: can be cause of https://bugs.chromium.org/p/chromium/issues/detail?id=1122461

Original change's description:
> Enable task service account on builders using "chromium-ci-builder@"
> 
> With Goma builders, we have confirmed that
> chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com
> works as without using task service account for Goma.
> Let me migrate the builders.
> 
> Bug: 1105814
> Change-Id: Ic4dedf38c59f358909014d4f8b0c9379914bcb2c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2378780
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#802101}

TBR=ukai@google.com,yyanagisawa@chromium.org,tikuta@chromium.org,yekuang@google.com

Change-Id: I7f75e78ef9eb6f5439d38dcd9b3333ea1ab3a841
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1105814
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379332Reviewed-by: default avatarYoshisato Yanagisawa <yyanagisawa@chromium.org>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802144}
parent 2d338d1a
...@@ -47,7 +47,6 @@ defaults.service_account.set( ...@@ -47,7 +47,6 @@ defaults.service_account.set(
"chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com", "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com",
) )
defaults.swarming_tags.set(["vpython:native-python-wrapper"]) defaults.swarming_tags.set(["vpython:native-python-wrapper"])
defaults.goma_use_luci_auth.set(True)
def ci_builder(*, name, **kwargs): def ci_builder(*, name, **kwargs):
return builder( return builder(
......
...@@ -32,7 +32,6 @@ buckets { ...@@ -32,7 +32,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
...@@ -58,7 +57,6 @@ buckets { ...@@ -58,7 +57,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
...@@ -84,7 +82,6 @@ buckets { ...@@ -84,7 +82,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
...@@ -111,7 +108,6 @@ buckets { ...@@ -111,7 +108,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
...@@ -137,7 +133,6 @@ buckets { ...@@ -137,7 +133,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
...@@ -163,7 +158,6 @@ buckets { ...@@ -163,7 +158,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
...@@ -189,7 +183,6 @@ buckets { ...@@ -189,7 +183,6 @@ buckets {
name: "swarming/staging" name: "swarming/staging"
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/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"use_luci_auth\":true}"
properties_j: "builder_group:\"chromium.dev\"" properties_j: "builder_group:\"chromium.dev\""
} }
execution_timeout_secs: 10800 execution_timeout_secs: 10800
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -110,7 +110,6 @@ def set_defaults(milestone_vars, **kwargs): ...@@ -110,7 +110,6 @@ def set_defaults(milestone_vars, **kwargs):
service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com", service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
swarming_tags = ["vpython:native-python-wrapper"], swarming_tags = ["vpython:native-python-wrapper"],
triggered_by = [milestone_vars.ci_poller], triggered_by = [milestone_vars.ci_poller],
goma_use_luci_auth = True,
) )
default_values.update(kwargs) default_values.update(kwargs)
for k, v in default_values.items(): for k, v in default_values.items():
......
...@@ -44,7 +44,6 @@ defaults.pool.set("luci.chromium.webrtc.fyi") ...@@ -44,7 +44,6 @@ defaults.pool.set("luci.chromium.webrtc.fyi")
defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com") defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com")
defaults.swarming_tags.set(["vpython:native-python-wrapper"]) defaults.swarming_tags.set(["vpython:native-python-wrapper"])
defaults.triggered_by.set(["webrtc-gitiles-trigger-master"]) defaults.triggered_by.set(["webrtc-gitiles-trigger-master"])
defaults.goma_use_luci_auth.set(True)
# Builders are defined in lexicographic order by name # Builders are defined in lexicographic order by name
......
...@@ -37,7 +37,6 @@ defaults.os.set(os.LINUX_DEFAULT) ...@@ -37,7 +37,6 @@ defaults.os.set(os.LINUX_DEFAULT)
defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com") defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com")
defaults.swarming_tags.set(["vpython:native-python-wrapper"]) defaults.swarming_tags.set(["vpython:native-python-wrapper"])
defaults.triggered_by.set(["master-gitiles-trigger"]) defaults.triggered_by.set(["master-gitiles-trigger"])
defaults.goma_use_luci_auth.set(True)
defaults.properties.set({ defaults.properties.set({
"perf_dashboard_machine_group": "ChromiumWebRTC", "perf_dashboard_machine_group": "ChromiumWebRTC",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment