From ab386814acbc86a2e2467e527f275fd357da97f7 Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Fri, 28 Oct 2022 13:53:39 +0900 Subject: [infra] Set reclient properties to libyuv builders libyuv project will use the same RBE backend with webrtc project. Bug: b:239908030 Change-Id: I1c852e57bce2fcef159d930c36f210939b4f3432 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3990126 Reviewed-by: Christoffer Jansson Commit-Queue: Junji Watanabe --- infra/config/cr-buildbucket.cfg | 220 ++++++++++++++++++++++++++++++++++++++++ infra/config/main.star | 12 +++ infra/config/project.cfg | 2 +- 3 files changed, 233 insertions(+), 1 deletion(-) diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 061cf33b..50ea625a 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -34,6 +34,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -65,6 +69,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -96,6 +104,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -124,6 +136,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -152,6 +168,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -180,6 +200,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -211,6 +235,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -242,6 +270,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -273,6 +305,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -304,6 +340,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -335,6 +375,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -366,6 +410,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -397,6 +445,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -428,6 +480,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -459,6 +515,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -490,6 +550,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -521,6 +585,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -550,6 +618,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -579,6 +651,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -608,6 +684,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -639,6 +719,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -670,6 +754,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -701,6 +789,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -732,6 +824,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -763,6 +859,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -794,6 +894,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -825,6 +929,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -856,6 +964,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -885,6 +997,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -914,6 +1030,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-trusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "client.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -998,6 +1118,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1026,6 +1150,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1054,6 +1182,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1085,6 +1217,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1116,6 +1252,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1145,6 +1285,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1174,6 +1318,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1205,6 +1353,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1236,6 +1388,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1267,6 +1423,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1298,6 +1458,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1329,6 +1493,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1360,6 +1528,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1391,6 +1563,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1422,6 +1598,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1451,6 +1631,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1480,6 +1664,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1509,6 +1697,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1540,6 +1732,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "run_presubmit",' ' "repo_name": "libyuv",' @@ -1573,6 +1769,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1604,6 +1804,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1635,6 +1839,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1666,6 +1874,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1697,6 +1909,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' @@ -1728,6 +1944,10 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' + ' "$build/reclient": {' + ' "instance": "rbe-webrtc-untrusted",' + ' "metrics_project": "chromium-reclient-metrics"' + ' },' ' "builder_group": "tryserver.libyuv",' ' "recipe": "libyuv/libyuv"' '}' diff --git a/infra/config/main.star b/infra/config/main.star index b922ca02..1268e684 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -26,6 +26,16 @@ GOMA_BACKEND_RBE_NO_ATS_PROD = { "enable_ats": False, } +RECLIENT_CI = { + "instance": "rbe-webrtc-trusted", + "metrics_project": "chromium-reclient-metrics", +} + +RECLIENT_CQ = { + "instance": "rbe-webrtc-untrusted", + "metrics_project": "chromium-reclient-metrics", +} + # Use LUCI Scheduler BBv2 names and add Scheduler realms configs. lucicfg.enable_experiment("crbug.com/1182002") @@ -255,6 +265,7 @@ def libyuv_try_builder(name, dimensions, properties, recipe_name = "libyuv/libyu def ci_builder(name, os, category, short_name = None): dimensions = get_os_dimensions(os) properties = get_os_properties(os) + properties["$build/reclient"] = RECLIENT_CI dimensions["pool"] = "luci.flex.ci" properties["builder_group"] = "client.libyuv" @@ -266,6 +277,7 @@ def ci_builder(name, os, category, short_name = None): def try_builder(name, os, experiment_percentage = None): dimensions = get_os_dimensions(os) properties = get_os_properties(os, try_builder = True) + properties["$build/reclient"] = RECLIENT_CQ dimensions["pool"] = "luci.flex.try" properties["builder_group"] = "tryserver.libyuv" diff --git a/infra/config/project.cfg b/infra/config/project.cfg index 700226ad..52797c1c 100644 --- a/infra/config/project.cfg +++ b/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "libyuv" access: "group:all" lucicfg { - version: "1.30.9" + version: "1.32.1" package_dir: "." config_dir: "." entry_point: "main.star" -- cgit v1.2.3