From 894f61772da348ca1fd9d31b3a5c9f91a63df881 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Tue, 9 May 2023 09:22:19 +0200 Subject: [PATCH] Increase timeout to 3h for bots that compile Chromium. This is to prevent timeouts like this one: https://ci.chromium.org/ui/p/webrtc/builders/try/linux_chromium_compile_dbg/33279/overview Change-Id: I88eb7db91dba3c1b19b2fb1785796df2ac4d0374 Bug: b/280969636 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304640 Commit-Queue: Jeremy Leconte Reviewed-by: Andrey Logvin Cr-Commit-Position: refs/heads/main@{#40018} --- infra/config/config.star | 24 +++++++++++++++++------- infra/config/cr-buildbucket.cfg | 14 +++++++------- infra/config/project.cfg | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/infra/config/config.star b/infra/config/config.star index 4baeb5f410..35ed6ee201 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -653,6 +653,16 @@ def cron_builder(name, service_account = None, **kwargs): **kwargs ) +def chromium_try_builder(name, **kwargs): + return try_builder( + name, + builder = "chromium-compile", + recipe = "chromium_trybot", + branch_cq = False, + execution_timeout = 3 * time.hour, + **kwargs + ) + def normal_builder_factory(**common_kwargs): def builder(*args, **kwargs): kwargs.update(common_kwargs) @@ -702,7 +712,7 @@ ci_builder("Android32 Builder x86", "Android|x86|rel") try_builder("android_compile_x86_rel") ci_builder("Android32 (more configs)", "Android|arm|more") try_builder("android_arm_more_configs") -try_builder("android_chromium_compile", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False) +chromium_try_builder("android_chromium_compile") ios_builder("iOS64 Debug", "iOS|arm64|dbg") ios_try_job("ios_compile_arm64_dbg") @@ -748,9 +758,9 @@ try_builder("linux_libfuzzer_rel", recipe = "libfuzzer") ci_builder("Linux (more configs)", "Linux|x64|more") try_builder("linux_more_configs") try_builder("linux_coverage") -try_builder("webrtc_linux_chromium", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False) -try_builder("linux_chromium_compile", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False, cq = None) -try_builder("linux_chromium_compile_dbg", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False) +chromium_try_builder("webrtc_linux_chromium") +chromium_try_builder("linux_chromium_compile", cq = None) +chromium_try_builder("linux_chromium_compile_dbg") ci_builder("Fuchsia Builder", ci_cat = None, perf_cat = "Fuchsia|x64|Builder|", prioritized = True) ci_builder("Fuchsia Release", "Fuchsia|x64|rel") @@ -772,7 +782,7 @@ try_builder("mac_asan") ci_builder("MacARM64 M1 Release", "Mac|arm64M1|rel", cpu = "arm64-64-Apple_M1") try_builder("mac_rel_m1") try_builder("mac_dbg_m1") -try_builder("mac_chromium_compile", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False) +chromium_try_builder("mac_chromium_compile") ci_builder("Win32 Debug (Clang)", "Win Clang|x86|dbg") try_builder("win_x86_clang_dbg", cq = None) @@ -792,8 +802,8 @@ ci_builder("Win64 ASan", "Win Clang|x64|asan") try_builder("win_asan") ci_builder("Win (more configs)", "Win Clang|x86|more") try_builder("win_x86_more_configs") -try_builder("win_chromium_compile", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False) -try_builder("win_chromium_compile_dbg", builder = "chromium-compile", recipe = "chromium_trybot", branch_cq = False) +chromium_try_builder("win_chromium_compile") +chromium_try_builder("win_chromium_compile_dbg") try_builder( "presubmit", diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 04457d1621..6555031b5d 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -3020,7 +3020,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -3745,7 +3745,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -3792,7 +3792,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -4685,7 +4685,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -5063,7 +5063,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -5157,7 +5157,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { @@ -5204,7 +5204,7 @@ buckets { ' "recipe": "chromium_trybot"' '}' priority: 30 - execution_timeout_secs: 7200 + execution_timeout_secs: 10800 build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" experiments { diff --git a/infra/config/project.cfg b/infra/config/project.cfg index d0d0dec71e..640686739d 100644 --- a/infra/config/project.cfg +++ b/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "webrtc" access: "group:all" lucicfg { - version: "1.39.8" + version: "1.39.4" package_dir: "." config_dir: "." entry_point: "config.star"