Skip to content

Commit d240ba2

Browse files
Jwatacopybara-github
authored andcommitted
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} NOKEYCHECK=True GitOrigin-RevId: f9ca08523db1ea599ecb4b2ce9ac32d7907cf892
1 parent 0856b56 commit d240ba2

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

config/siso/config.star

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ __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",
2934
]
3035

3136
def __check(ctx):

config/siso/main.star

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ 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")
1314
load("./gn_logs.star", "gn_logs")
1415
load("./linux.star", chromium_linux = "chromium")
1516
load("./mac.star", chromium_mac = "chromium")
@@ -28,6 +29,13 @@ def __disable_remote(ctx, step_config):
2829
rule["remote"] = False
2930
return step_config
3031

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+
3139
def init(ctx):
3240
print("runtime: os:%s arch:%s run:%d" % (
3341
runtime.os,
@@ -80,6 +88,7 @@ def init(ctx):
8088
rule["remote_command"] = arg0
8189

8290
step_config = __disable_remote(ctx, step_config)
91+
step_config = __unset_timeout(ctx, step_config)
8392

8493
filegroups = {}
8594
filegroups.update(blink_all.filegroups(ctx))

0 commit comments

Comments
 (0)