Skip to content

Commit de5b56f

Browse files
Jwatacopybara-github
authored andcommitted
Revert "siso: Disable remote timeout on linux-official bots"
This reverts commit f9ca08523db1ea599ecb4b2ce9ac32d7907cf892. Reason for revert: It seems to cause this build error. https://ci.chromium.org/ui/p/chromium/builders/ci/linux-official/12996/overview Bug: 427503493 Original change's description: > siso: Disable remote timeout on linux-official bots > > Remote linking for official builds takes much longer than usual. > e.g. 30 minutes for components_unittests > > "no-remote-timeout" config allows disables remote timeout easily > for the specific builders. > > The build speed improves further: > With remote linking, without remote timeout: > 52 minutes at compile step > https://ci.chromium.org/ui/p/chromium/builders/try/linux-official/1543/overview > > Only with remote linking: > 74 minutes at compile step. > https://ci.chromium.org/ui/p/chromium/builders/try/linux-official/1534/overview > > Cq-Include-Trybots: luci.chromium.try:linux-official > Bug: 427503493 > Change-Id: I4b7bbcc706683ecae2ae756befaf80cf3df00275 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6678433 > Auto-Submit: Junji Watanabe <[email protected]> > Reviewed-by: Takuto Ikuta <[email protected]> > Commit-Queue: Junji Watanabe <[email protected]> > Reviewed-by: Fumitoshi Ukai <[email protected]> > Cr-Commit-Position: refs/heads/main@{#1480346} Bug: 427503493 Cq-Include-Trybots: luci.chromium.try:linux-official No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I5858c11569b14a623a0daa400dc139c1c8405e01 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6689746 Bot-Commit: Rubber Stamper <[email protected]> Auto-Submit: Junji Watanabe <[email protected]> Reviewed-by: Takuto Ikuta <[email protected]> Commit-Queue: Takuto Ikuta <[email protected]> Cr-Commit-Position: refs/heads/main@{#1480447} NOKEYCHECK=True GitOrigin-RevId: 63bfacd0b4086ed478cef81f94e9604d731f6f54
1 parent d240ba2 commit de5b56f

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

config/siso/config.star

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ __KNOWN_CONFIG_OPTIONS = [
2626
# because developers need objects and tests locally for debugging
2727
# and testing.
2828
"remote-link",
29-
30-
# Unset timeout from rules to allow long remote steps.
31-
# This is useful when remote actions are expected to take longer than
32-
# the configured timeouts. e.g. remote linking for official builds.
33-
"no-remote-timeout",
3429
]
3530

3631
def __check(ctx):

config/siso/main.star

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ load("@builtin//runtime.star", "runtime")
1010
load("@builtin//struct.star", "module")
1111
load("./backend_config/backend.star", "backend")
1212
load("./blink_all.star", "blink_all")
13-
load("./config.star", "config")
1413
load("./gn_logs.star", "gn_logs")
1514
load("./linux.star", chromium_linux = "chromium")
1615
load("./mac.star", chromium_mac = "chromium")
@@ -29,13 +28,6 @@ def __disable_remote(ctx, step_config):
2928
rule["remote"] = False
3029
return step_config
3130

32-
def __unset_timeout(ctx, step_config):
33-
if not config.get(ctx, "no-remote-timeout"):
34-
return step_config
35-
for rule in step_config["rules"]:
36-
rule.pop("timeout", None)
37-
return step_config
38-
3931
def init(ctx):
4032
print("runtime: os:%s arch:%s run:%d" % (
4133
runtime.os,
@@ -88,7 +80,6 @@ def init(ctx):
8880
rule["remote_command"] = arg0
8981

9082
step_config = __disable_remote(ctx, step_config)
91-
step_config = __unset_timeout(ctx, step_config)
9283

9384
filegroups = {}
9485
filegroups.update(blink_all.filegroups(ctx))

0 commit comments

Comments
 (0)