Update gen_luci_scheduler with R85 branch
BUG=None
TEST=None
Change-Id: I7eb073d93ef5bbcdece6d4676bfc143ca378470e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2270726
Tested-by: Daniel Gagnon <dgagnon@google.com>
Auto-Submit: Daniel Gagnon <dgagnon@google.com>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Reviewed-by: Marina Kazatcker <marinakz@google.com>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 9f39a9a..582d748 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -3116,6 +3116,16 @@
# (<branch>, [<android PFQs>], <chrome PFQ>, [<orderfiles>], [<Chrome AFDOs>])
RELEASES = [
+ ('release-R85-13310.B',
+ ['grunt-android-pi-pre-flight-branch'],
+ 'chell-chrome-no-afdo-uprev-pre-flight-branch',
+ ['orderfile-generate-toolchain',
+ 'orderfile-verify-toolchain'],
+ ['benchmark-afdo-generate',
+ 'chrome-silvermont-release-afdo-verify',
+ 'chrome-airmont-release-afdo-verify',
+ 'chrome-broadwell-release-afdo-verify']),
+
('release-R84-13099.B',
['grunt-android-pi-pre-flight-branch'],
'chell-chrome-no-afdo-uprev-pre-flight-branch',
@@ -3135,16 +3145,6 @@
'chrome-silvermont-release-afdo-verify',
'chrome-airmont-release-afdo-verify',
'chrome-broadwell-release-afdo-verify']),
-
- ('release-R81-12871.B',
- ['grunt-android-pi-pre-flight-branch'],
- 'chell-chrome-no-afdo-uprev-pre-flight-branch',
- ['orderfile-generate-toolchain',
- 'orderfile-verify-toolchain'],
- ['benchmark-afdo-generate',
- 'chrome-silvermont-release-afdo-verify',
- 'chrome-airmont-release-afdo-verify',
- 'chrome-broadwell-release-afdo-verify']),
]
RELEASE_SCHEDULES = [
diff --git a/config/luci-scheduler.cfg b/config/luci-scheduler.cfg
index 877e236..135175c 100644
--- a/config/luci-scheduler.cfg
+++ b/config/luci-scheduler.cfg
@@ -42,9 +42,9 @@
schedule: "with 5m interval"
gitiles: {
repo: "https://chromium.googlesource.com/chromium/src"
- refs: "regexp:refs/tags/81\\..*"
+ refs: "regexp:refs/tags/83\\..*"
}
- triggers: "release-R81-12871.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ triggers: "release-R83-13020.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
}
trigger {
@@ -53,9 +53,9 @@
schedule: "with 5m interval"
gitiles: {
repo: "https://chromium.googlesource.com/chromium/src"
- refs: "regexp:refs/tags/83\\..*"
+ refs: "regexp:refs/tags/84\\..*"
}
- triggers: "release-R83-13020.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ triggers: "release-R84-13099.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
}
trigger {
@@ -64,9 +64,9 @@
schedule: "with 5m interval"
gitiles: {
repo: "https://chromium.googlesource.com/chromium/src"
- refs: "regexp:refs/tags/84\\..*"
+ refs: "regexp:refs/tags/85\\..*"
}
- triggers: "release-R84-13099.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ triggers: "release-R85-13310.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
}
trigger {
@@ -2498,13 +2498,175 @@
}
job {
- id: "release-R84-13099.B-master-release"
+ id: "release-R85-13310.B-master-release"
acl_sets: "default"
schedule: "0 6 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:master-release"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:master-release"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-grunt-android-pi-pre-flight-branch"
+ acl_sets: "default"
+ schedule: "0 3,7,11,15,19,23 * * *"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:grunt-android-pi-pre-flight-branch"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:grunt-android-pi-pre-flight-branch"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ acl_sets: "default"
+ schedule: "triggered"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-orderfile-generate-toolchain"
+ acl_sets: "default"
+ schedule: "0 8/12 * * *"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:orderfile-generate-toolchain"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:orderfile-generate-toolchain"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-orderfile-verify-toolchain"
+ acl_sets: "default"
+ schedule: "0 0/12 * * *"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:orderfile-verify-toolchain"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:orderfile-verify-toolchain"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-benchmark-afdo-generate"
+ acl_sets: "default"
+ schedule: "0 8/12 * * *"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:benchmark-afdo-generate"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:benchmark-afdo-generate"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-chrome-silvermont-release-afdo-verify"
+ acl_sets: "default"
+ schedule: "0 3 * * 0,4"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:chrome-silvermont-release-afdo-verify"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:chrome-silvermont-release-afdo-verify"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-chrome-airmont-release-afdo-verify"
+ acl_sets: "default"
+ schedule: "0 3 * * 0,4"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:chrome-airmont-release-afdo-verify"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:chrome-airmont-release-afdo-verify"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R85-13310.B-chrome-broadwell-release-afdo-verify"
+ acl_sets: "default"
+ schedule: "0 3 * * 0,4"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
+ tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_config:chrome-broadwell-release-afdo-verify"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_config:chrome-broadwell-release-afdo-verify"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R84-13099.B-master-release"
+ acl_sets: "default"
+ schedule: "0 5 * * *"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Release"
tags: "cbb_branch:release-R84-13099.B"
tags: "cbb_config:master-release"
tags: "cbb_display_label:release"
@@ -2518,7 +2680,7 @@
job {
id: "release-R84-13099.B-grunt-android-pi-pre-flight-branch"
acl_sets: "default"
- schedule: "0 3,7,11,15,19,23 * * *"
+ schedule: "0 2,6,10,14,18,22 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
@@ -2662,7 +2824,7 @@
job {
id: "release-R83-13020.B-master-release"
acl_sets: "default"
- schedule: "0 5 * * *"
+ schedule: "0 7 * * 2,4"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
@@ -2820,165 +2982,3 @@
properties: "cbb_extra_args:[\"--buildbot\"]"
}
}
-
-job {
- id: "release-R81-12871.B-master-release"
- acl_sets: "default"
- schedule: "0 7 * * 2,4"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:master-release"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:master-release"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-grunt-android-pi-pre-flight-branch"
- acl_sets: "default"
- schedule: "0 2,6,10,14,18,22 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:grunt-android-pi-pre-flight-branch"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:grunt-android-pi-pre-flight-branch"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
- acl_sets: "default"
- schedule: "triggered"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-orderfile-generate-toolchain"
- acl_sets: "default"
- schedule: "0 8/12 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:orderfile-generate-toolchain"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:orderfile-generate-toolchain"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-orderfile-verify-toolchain"
- acl_sets: "default"
- schedule: "0 0/12 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:orderfile-verify-toolchain"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:orderfile-verify-toolchain"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-benchmark-afdo-generate"
- acl_sets: "default"
- schedule: "0 8/12 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:benchmark-afdo-generate"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:benchmark-afdo-generate"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-chrome-silvermont-release-afdo-verify"
- acl_sets: "default"
- schedule: "0 3 * * 0,4"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:chrome-silvermont-release-afdo-verify"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:chrome-silvermont-release-afdo-verify"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-chrome-airmont-release-afdo-verify"
- acl_sets: "default"
- schedule: "0 3 * * 0,4"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:chrome-airmont-release-afdo-verify"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:chrome-airmont-release-afdo-verify"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-chrome-broadwell-release-afdo-verify"
- acl_sets: "default"
- schedule: "0 3 * * 0,4"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "Release"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:chrome-broadwell-release-afdo-verify"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:chrome-broadwell-release-afdo-verify"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
