diff --git a/infra/config/config.star b/infra/config/config.star index f5c46b52d3..203a557239 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -523,7 +523,6 @@ def ci_builder( perf_cat = None, prioritized = False, enabled = True, - use_reclient = False, **kwargs): """Add a post-submit builder. @@ -535,7 +534,6 @@ def ci_builder( perf_cat: the category + name for the /perf/ console, or None to omit from the console. prioritized: True to make this builder have a higher priority and never batch builds. enabled: False to exclude this builder from consoles and failure notifications. - use_reclient: True to use reclient to build instead of goma. **kwargs: Pass on to webrtc_builder / luci.builder. Returns: A luci.builder. @@ -557,10 +555,10 @@ def ci_builder( properties = properties or {} properties = dict(properties) # Avoid mutating the original dict. properties["builder_group"] = "client.webrtc" - if use_reclient: - properties.update(make_reclient_properties("rbe-webrtc-trusted")) - else: - properties.update(make_goma_properties()) + properties.update(make_reclient_properties("rbe-webrtc-trusted")) + + # TODO(b/245249582): remove goma properties after reclient migration. + properties.update(make_goma_properties()) notifies = ["post_submit_failure_notifier", "infra_failure_notifier"] notifies += ["webrtc_tree_closer"] if name not in skipped_lkgr_bots else [] return webrtc_builder( @@ -703,7 +701,7 @@ android_builder("Android32 (M Nexus5X)(dbg)", "Android|arm|dbg") android_try_job("android_compile_arm_dbg", cq = None) android_try_job("android_arm_dbg") android_builder("Android32 (M Nexus5X)", "Android|arm|rel") -android_builder("Android32 (M Nexus5X)(reclient)", "Android|arm|re", use_reclient = True) +android_builder("Android32 (M Nexus5X)(reclient)", "Android|arm|re") android_try_job("android_arm_rel") android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True) android_try_job("android_compile_arm_rel") @@ -731,7 +729,7 @@ android_try_job("android_chromium_compile", recipe = "chromium_trybot", branch_c ios_builder("iOS64 Debug", "iOS|arm64|dbg") ios_try_job("ios_compile_arm64_dbg") ios_builder("iOS64 Release", "iOS|arm64|rel") -ios_builder("iOS64 Release (reclient)", "iOS|arm64|re", use_reclient = True) +ios_builder("iOS64 Release (reclient)", "iOS|arm64|re") ios_try_job("ios_compile_arm64_rel") ios_builder("iOS64 Sim Debug (iOS 14)", "iOS|x64|14") ios_try_job("ios_sim_x64_dbg_ios14") @@ -750,7 +748,7 @@ linux_builder("Linux64 Debug", "Linux|x64|dbg") linux_try_job("linux_dbg", cq = None) linux_try_job("linux_compile_dbg") linux_builder("Linux64 Release", "Linux|x64|rel") -linux_builder("Linux64 Release (reclient)", "Linux|x64|re", use_reclient = True) +linux_builder("Linux64 Release (reclient)", "Linux|x64|re") linux_try_job("linux_rel") linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True) linux_try_job("linux_compile_rel") @@ -784,7 +782,7 @@ mac_builder("Mac64 Debug", "Mac|x64|dbg") mac_try_job("mac_dbg", cq = None) mac_try_job("mac_compile_dbg") mac_builder("Mac64 Release", "Mac|x64|rel") -mac_builder("Mac64 Release (reclient)", "Mac|x64|re", use_reclient = True) +mac_builder("Mac64 Release (reclient)", "Mac|x64|re") mac_try_job("mac_rel") mac_try_job("mac_compile_rel", cq = None) mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|") @@ -812,7 +810,7 @@ win_try_job("win_x64_clang_dbg", cq = None) win_try_job("win_x64_clang_dbg_win10", cq = None) win_try_job("win_compile_x64_clang_dbg") win_builder("Win64 Release (Clang)", "Win Clang|x64|rel") -win_builder("Win64 Release (Clang)(reclient)", "Win Clang|x64|re", use_reclient = True) +win_builder("Win64 Release (Clang)(reclient)", "Win Clang|x64|re") win_try_job("win_x64_clang_rel", cq = None) win_try_job("win_compile_x64_clang_rel") win_builder("Win64 ASan", "Win Clang|x64|asan") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 33a9df4c86..f21b25f3d7 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -32,6 +32,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -78,6 +82,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -120,6 +128,10 @@ buckets { } properties: '{' + ' "$build/goma": {' + ' "server_host": "goma.chromium.org",' + ' "use_luci_auth": true' + ' },' ' "$build/reclient": {' ' "instance": "rbe-webrtc-trusted",' ' "metrics_project": "chromium-reclient-metrics"' @@ -170,6 +182,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -216,6 +232,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -262,6 +282,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -308,6 +332,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -354,6 +382,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -401,6 +433,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -448,6 +484,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -495,6 +535,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -542,6 +586,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -589,6 +637,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -636,6 +688,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -683,6 +739,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -730,6 +790,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -777,6 +841,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -824,6 +892,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -871,6 +943,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -918,6 +994,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -965,6 +1045,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1012,6 +1096,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1059,6 +1147,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1102,6 +1194,10 @@ buckets { } properties: '{' + ' "$build/goma": {' + ' "server_host": "goma.chromium.org",' + ' "use_luci_auth": true' + ' },' ' "$build/reclient": {' ' "instance": "rbe-webrtc-trusted",' ' "metrics_project": "chromium-reclient-metrics"' @@ -1152,6 +1248,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1198,6 +1298,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1244,6 +1348,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1286,6 +1394,10 @@ buckets { } properties: '{' + ' "$build/goma": {' + ' "server_host": "goma.chromium.org",' + ' "use_luci_auth": true' + ' },' ' "$build/reclient": {' ' "instance": "rbe-webrtc-trusted",' ' "metrics_project": "chromium-reclient-metrics"' @@ -1336,6 +1448,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1382,6 +1498,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1428,6 +1548,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1474,6 +1598,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1520,6 +1648,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1566,6 +1698,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1612,6 +1748,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1654,6 +1794,10 @@ buckets { } properties: '{' + ' "$build/goma": {' + ' "server_host": "goma.chromium.org",' + ' "use_luci_auth": true' + ' },' ' "$build/reclient": {' ' "instance": "rbe-webrtc-trusted",' ' "metrics_project": "chromium-reclient-metrics"' @@ -1704,6 +1848,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1755,6 +1903,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1806,6 +1958,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1912,6 +2068,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -1963,6 +2123,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2014,6 +2178,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2288,6 +2456,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2334,6 +2506,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2381,6 +2557,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2427,6 +2607,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2473,6 +2657,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -2879,6 +3067,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": ['