diff options
Diffstat (limited to 'files/infra/config')
| -rw-r--r-- | files/infra/config/PRESUBMIT.py | 2 | ||||
| -rw-r--r-- | files/infra/config/cr-buildbucket.cfg | 252 | ||||
| -rwxr-xr-x | files/infra/config/main.star | 20 | ||||
| -rw-r--r-- | files/infra/config/project.cfg | 2 | ||||
| -rw-r--r-- | files/infra/config/realms.cfg | 4 |
5 files changed, 261 insertions, 19 deletions
diff --git a/files/infra/config/PRESUBMIT.py b/files/infra/config/PRESUBMIT.py index 01ec0eed..f79e08ad 100644 --- a/files/infra/config/PRESUBMIT.py +++ b/files/infra/config/PRESUBMIT.py @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +USE_PYTHON3 = True + def CheckChangeOnUpload(input_api, output_api): return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api) diff --git a/files/infra/config/cr-buildbucket.cfg b/files/infra/config/cr-buildbucket.cfg index 061cf33b..be9d1d28 100644 --- a/files/infra/config/cr-buildbucket.cfg +++ b/files/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"' '}' @@ -111,7 +123,7 @@ buckets { name: "Android Tester ARM32 Debug (Nexus 5X)" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" - dimensions: "device_type:bullhead" + dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -139,7 +155,7 @@ buckets { name: "Android Tester ARM32 Release (Nexus 5X)" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" - dimensions: "device_type:bullhead" + dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -167,7 +187,7 @@ buckets { name: "Android Tester ARM64 Debug (Nexus 5X)" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" - dimensions: "device_type:bullhead" + dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -537,7 +605,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -566,7 +638,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -595,7 +671,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -872,7 +984,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -901,7 +1017,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -985,7 +1105,7 @@ buckets { name: "android" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" - dimensions: "device_type:bullhead" + dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1013,7 +1137,7 @@ buckets { name: "android_arm64" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" - dimensions: "device_type:bullhead" + dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1041,7 +1169,7 @@ buckets { name: "android_rel" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" - dimensions: "device_type:bullhead" + dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1132,7 +1272,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1161,7 +1305,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1438,7 +1618,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1467,7 +1651,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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"' '}' @@ -1496,7 +1684,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-12" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -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/files/infra/config/main.star b/files/infra/config/main.star index b922ca02..7490a599 100755 --- a/files/infra/config/main.star +++ b/files/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") @@ -70,6 +80,10 @@ luci.project( ], bindings = [ luci.binding( + roles = "role/swarming.taskTriggerer", # for LED tasks. + groups = "project-libyuv-admins", + ), + luci.binding( roles = "role/configs.validator", users = "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com", ), @@ -195,9 +209,9 @@ luci.bucket( def get_os_dimensions(os): if os == "android": - return {"device_type": "bullhead"} + return {"device_type": "walleye"} if os == "ios" or os == "mac": - return {"os": "Mac-10.15", "cpu": "x86-64"} + return {"os": "Mac-12", "cpu": "x86-64"} elif os == "win": return {"os": "Windows-10", "cores": "8", "cpu": "x86-64"} elif os == "linux": @@ -255,6 +269,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 +281,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/files/infra/config/project.cfg b/files/infra/config/project.cfg index 700226ad..af79cfb2 100644 --- a/files/infra/config/project.cfg +++ b/files/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "libyuv" access: "group:all" lucicfg { - version: "1.30.9" + version: "1.39.8" package_dir: "." config_dir: "." entry_point: "main.star" diff --git a/files/infra/config/realms.cfg b/files/infra/config/realms.cfg index ae04529e..16ffaac9 100644 --- a/files/infra/config/realms.cfg +++ b/files/infra/config/realms.cfg @@ -38,6 +38,10 @@ realms { role: "role/scheduler.reader" principals: "group:all" } + bindings { + role: "role/swarming.taskTriggerer" + principals: "group:project-libyuv-admins" + } } realms { name: "ci" |