diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg index 08ac90abf..061cf33b3 100644 --- a/cr-buildbucket.cfg +++ b/cr-buildbucket.cfg @@ -44,10 +44,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android Debug" @@ -79,10 +75,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android Release" @@ -114,10 +106,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android Tester ARM32 Debug (Nexus 5X)" @@ -146,10 +134,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android Tester ARM32 Release (Nexus 5X)" @@ -178,10 +162,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android Tester ARM64 Debug (Nexus 5X)" @@ -210,10 +190,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android32 x86 Debug" @@ -245,10 +221,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Android64 x64 Debug" @@ -280,10 +252,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux Asan" @@ -315,10 +283,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux MSan" @@ -350,10 +314,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux Tsan v2" @@ -385,10 +345,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux UBSan" @@ -420,10 +376,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux UBSan vptr" @@ -455,10 +407,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux32 Debug" @@ -490,10 +438,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux32 Release" @@ -525,10 +469,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux64 Debug" @@ -560,10 +500,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Linux64 Release" @@ -595,10 +531,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Mac Asan" @@ -628,10 +560,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Mac64 Debug" @@ -661,10 +589,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Mac64 Release" @@ -694,10 +618,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win32 Debug" @@ -729,10 +649,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win32 Debug (Clang)" @@ -764,10 +680,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win32 Release" @@ -799,10 +711,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win32 Release (Clang)" @@ -834,10 +742,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win64 Debug" @@ -869,10 +773,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win64 Debug (Clang)" @@ -904,10 +804,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win64 Release" @@ -939,10 +835,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "Win64 Release (Clang)" @@ -974,10 +866,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "iOS ARM64 Debug" @@ -1007,10 +895,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "iOS ARM64 Release" @@ -1040,10 +924,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } } } @@ -1080,10 +960,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } } } @@ -1132,10 +1008,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "android_arm64" @@ -1164,10 +1036,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "android_rel" @@ -1196,10 +1064,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "android_x64" @@ -1231,10 +1095,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "android_x86" @@ -1266,10 +1126,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "ios_arm64" @@ -1299,10 +1155,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "ios_arm64_rel" @@ -1332,10 +1184,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux" @@ -1367,10 +1215,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_asan" @@ -1402,10 +1246,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_gcc" @@ -1437,10 +1277,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_msan" @@ -1472,10 +1308,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_rel" @@ -1507,10 +1339,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_tsan2" @@ -1542,10 +1370,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_ubsan" @@ -1577,10 +1401,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "linux_ubsan_vptr" @@ -1612,10 +1432,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "mac" @@ -1645,10 +1461,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "mac_asan" @@ -1678,10 +1490,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "mac_rel" @@ -1711,10 +1519,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "presubmit" @@ -1748,10 +1552,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "win" @@ -1783,10 +1583,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "win_clang" @@ -1818,10 +1614,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "win_clang_rel" @@ -1853,10 +1645,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "win_rel" @@ -1888,10 +1676,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "win_x64_clang_rel" @@ -1923,10 +1707,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "win_x64_rel" @@ -1958,10 +1738,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } } } diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg index efa259a17..0ec5dd0e5 100644 --- a/luci-scheduler.cfg +++ b/luci-scheduler.cfg @@ -10,7 +10,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android ARM64 Debug" } } @@ -20,7 +20,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android Debug" } } @@ -30,7 +30,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android Release" } } @@ -44,7 +44,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android Tester ARM32 Debug (Nexus 5X)" } } @@ -58,7 +58,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android Tester ARM32 Release (Nexus 5X)" } } @@ -72,7 +72,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android Tester ARM64 Debug (Nexus 5X)" } } @@ -82,7 +82,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android32 x86 Debug" } } @@ -92,7 +92,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Android64 x64 Debug" } } @@ -103,7 +103,7 @@ job { acl_sets: "cron" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.cron" + bucket: "cron" builder: "DEPS Autoroller" } } @@ -113,7 +113,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux Asan" } } @@ -123,7 +123,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux MSan" } } @@ -133,7 +133,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux Tsan v2" } } @@ -143,7 +143,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux UBSan" } } @@ -153,7 +153,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux UBSan vptr" } } @@ -163,7 +163,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux32 Debug" } } @@ -173,7 +173,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux32 Release" } } @@ -183,7 +183,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux64 Debug" } } @@ -193,7 +193,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Linux64 Release" } } @@ -203,7 +203,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Mac Asan" } } @@ -213,7 +213,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Mac64 Debug" } } @@ -223,7 +223,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Mac64 Release" } } @@ -233,7 +233,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win32 Debug" } } @@ -243,7 +243,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win32 Debug (Clang)" } } @@ -253,7 +253,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win32 Release" } } @@ -263,7 +263,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win32 Release (Clang)" } } @@ -273,7 +273,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win64 Debug" } } @@ -283,7 +283,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win64 Debug (Clang)" } } @@ -293,7 +293,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win64 Release" } } @@ -303,7 +303,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "Win64 Release (Clang)" } } @@ -313,7 +313,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "iOS ARM64 Debug" } } @@ -323,7 +323,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" + bucket: "ci" builder: "iOS ARM64 Release" } } diff --git a/main.star b/main.star index 2db1ddb30..b922ca028 100755 --- a/main.star +++ b/main.star @@ -3,7 +3,7 @@ """LUCI project configuration for libyuv CQ and CI.""" -lucicfg.check_version("1.23.0") +lucicfg.check_version("1.30.9") LIBYUV_GIT = "https://chromium.googlesource.com/libyuv/libyuv" LIBYUV_GERRIT = "https://chromium-review.googlesource.com/libyuv/libyuv" @@ -26,10 +26,11 @@ GOMA_BACKEND_RBE_NO_ATS_PROD = { "enable_ats": False, } -# Launch all builds in "realms-aware mode", crbug.com/1203285. +# Use LUCI Scheduler BBv2 names and add Scheduler realms configs. +lucicfg.enable_experiment("crbug.com/1182002") + luci.builder.defaults.experiments.set( { - "luci.use_realms": 100, "luci.recipes.use_python3": 100, }, ) diff --git a/project.cfg b/project.cfg index 26b088bd0..700226add 100644 --- a/project.cfg +++ b/project.cfg @@ -7,8 +7,9 @@ name: "libyuv" access: "group:all" lucicfg { - version: "1.30.5" + version: "1.30.9" package_dir: "." config_dir: "." entry_point: "main.star" + experiments: "crbug.com/1182002" } diff --git a/realms.cfg b/realms.cfg index 7360b512c..ae04529ef 100644 --- a/realms.cfg +++ b/realms.cfg @@ -45,6 +45,18 @@ realms { role: "role/buildbucket.builderServiceAccount" principals: "user:libyuv-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } + bindings { + role: "role/scheduler.triggerer" + principals: "user:libyuv-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + conditions { + restrict { + attribute: "scheduler.job.name" + values: "Android Tester ARM32 Debug (Nexus 5X)" + values: "Android Tester ARM32 Release (Nexus 5X)" + values: "Android Tester ARM64 Debug (Nexus 5X)" + } + } + } } realms { name: "cron"