chromeos_config: Set up R86 for LTS Builder
The LTS branch will begin at R86, thus splitting out the LTS branch to
its own builder for better resource management and tracking.
BUG=b:170391871
TEST='run_tests'
Change-Id: I5391e25203fafb1d5fab7905d17dfd883147ca7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2567366
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
(cherry picked from commit a4aafb89553ac158f046f37febf9dde4c84e3d06)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2716002
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index a8190bd..e1d76fb 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -2988,26 +2988,38 @@
# or the change will fail chromite unittests.
branch_builds = [
# Add non release branch schedules here, if needed.
- # <branch>, <build_config>, <display_label>, <schedule>, <triggers>
+ # <branch>, <build_config>, <display_label>, <schedule>, <triggers>,
+ # <builder>
# NOTE: R69, R73, R77 and R81 are Long Term Support (LTS) milestones for
# lakitu and they'd like to keep them a little longer. Please let
# lakitu-dev@google.com know before deleting this.
('release-R69-10895.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 4 * * *', None),
+ config_lib.DISPLAY_LABEL_RELEASE, '0 4 * * *', None,
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
('release-R73-11647.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 8 * * *', None),
+ config_lib.DISPLAY_LABEL_RELEASE, '0 8 * * *', None,
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
('release-R77-12371.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 12 * * *', None),
+ config_lib.DISPLAY_LABEL_RELEASE, '0 12 * * *', None,
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
('release-R81-12871.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 16 * * *', None),
+ config_lib.DISPLAY_LABEL_RELEASE, '0 16 * * *', None,
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
]
# The three active release branches.
# (<branch>, [<android PFQs>], <chrome PFQ>, [<orderfiles>], [<Chrome AFDOs>])
RELEASES = [
- ('release-R85-13310.B',
+ ('release-R88-13597.B',
+ ['grunt-android-pi-pre-flight-branch'],
+ '',
+ [],
+ [],
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
+
+ ('release-R87-13505.B',
['grunt-android-pi-pre-flight-branch'],
'chell-chrome-no-afdo-uprev-pre-flight-branch',
['orderfile-generate-toolchain',
@@ -3015,7 +3027,8 @@
['benchmark-afdo-generate',
'chrome-silvermont-release-afdo-verify',
'chrome-airmont-release-afdo-verify',
- 'chrome-broadwell-release-afdo-verify']),
+ 'chrome-broadwell-release-afdo-verify'],
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
('release-R84-13099.B',
['grunt-android-pi-pre-flight-branch'],
@@ -3025,9 +3038,10 @@
['benchmark-afdo-generate',
'chrome-silvermont-release-afdo-verify',
'chrome-airmont-release-afdo-verify',
- 'chrome-broadwell-release-afdo-verify']),
+ 'chrome-broadwell-release-afdo-verify'],
+ config_lib.LUCI_BUILDER_LEGACY_RELEASE),
- ('release-R83-13020.B',
+ ('release-R86-13421.B',
['grunt-android-pi-pre-flight-branch'],
'chell-chrome-no-afdo-uprev-pre-flight-branch',
['orderfile-generate-toolchain',
@@ -3035,13 +3049,8 @@
['benchmark-afdo-generate',
'chrome-silvermont-release-afdo-verify',
'chrome-airmont-release-afdo-verify',
- 'chrome-broadwell-release-afdo-verify']),
- ]
-
- RELEASE_SCHEDULES = [
- '0 6 * * *',
- '0 5 * * *',
- 'triggered',
+ 'chrome-broadwell-release-afdo-verify'],
+ config_lib.LUCI_BUILDER_LTS_RELEASE),
]
PFQ_SCHEDULE = [
@@ -3066,57 +3075,55 @@
'0 3/12 * * *',
]
- for ((branch, android_pfq, chrome_pfq, orderfile, afdo),
- schedule, android_schedule) in zip(
- RELEASES, RELEASE_SCHEDULES, PFQ_SCHEDULE):
+ assert len(RELEASES) == len(PFQ_SCHEDULE)
+ for ((branch, android_pfq, chrome_pfq, orderfile, afdo, builder),
+ android_schedule) in zip(
+ RELEASES, PFQ_SCHEDULE):
release_num = re.search(r'release-R(\d+)-.*', branch).group(1)
- # The oldest branch is only triggered by a Chrome uprev.
- if schedule == 'triggered':
- branch_builds.append(
- [branch, 'master-release',
- config_lib.DISPLAY_LABEL_RELEASE, schedule,
- [[('https://chromium.googlesource.com/chromiumos/' +
- 'overlays/chromiumos-overlay'),
- [r'regexp:refs/heads/%s\\..*' % branch],
- [('chromeos-base/chromeos-chrome/chromeos-chrome-%s.*.ebuild'
- % release_num)]]]])
- else:
- branch_builds.append([branch, 'master-release',
- config_lib.DISPLAY_LABEL_RELEASE,
- schedule, None])
+ # All branches are only triggered by a Chrome uprev, or manually.
+ branch_builds.append(
+ [branch, 'master-release',
+ config_lib.DISPLAY_LABEL_RELEASE, 'triggered',
+ [[('https://chromium.googlesource.com/chromiumos/' +
+ 'overlays/chromiumos-overlay'),
+ [r'regexp:refs/heads/%s\\..*' % branch],
+ [('chromeos-base/chromeos-chrome/chromeos-chrome-%s.*.ebuild'
+ % release_num)]]], builder])
branch_builds.extend([[branch, pfq,
config_lib.DISPLAY_LABEL_RELEASE,
- android_schedule, None]
+ android_schedule, None, builder]
for pfq in android_pfq])
- # We extract the release number from the branch, and use it to
- # watch for new chrome tags to trigger Chrome PFQ builds.
- # release-R71-11151.B -> 71 -> regexp:refs/tags/71\\..*
- branch_builds.append(
- [branch, chrome_pfq, config_lib.DISPLAY_LABEL_RELEASE, 'triggered',
- [['https://chromium.googlesource.com/chromium/src',
- [r'regexp:refs/tags/%s\\..*' % release_num]]]])
+ if chrome_pfq:
+ # We extract the release number from the branch, and use it to
+ # watch for new chrome tags to trigger Chrome PFQ builds.
+ # release-R71-11151.B -> 71 -> regexp:refs/tags/71\\..*
+ # Chrome PFQ is retired as of R88, so chrome_pfq may be empty.
+ branch_builds.append(
+ [branch, chrome_pfq, config_lib.DISPLAY_LABEL_RELEASE, 'triggered',
+ [['https://chromium.googlesource.com/chromium/src',
+ [r'regexp:refs/tags/%s\\..*' % release_num]]], builder])
if orderfile:
for b, s in zip(orderfile, ORDERFILE_SCHEDULES):
branch_builds.append([branch, b,
config_lib.DISPLAY_LABEL_RELEASE,
- s, None])
+ s, None, builder])
if afdo:
for b, s in zip(afdo, AFDO_SCHEDULES):
branch_builds.append([branch, b,
config_lib.DISPLAY_LABEL_RELEASE,
- s, None])
+ s, None, builder])
# Convert all branch builds into scheduler config entries.
default_config = config_lib.GetConfig().GetDefault()
result = []
- for branch, config_name, label, schedule, trigger in branch_builds:
+ for branch, config_name, label, schedule, trigger, builder in branch_builds:
result.append(default_config.derive(
name=config_name,
display_label=label,
- luci_builder=config_lib.LUCI_BUILDER_LEGACY_RELEASE,
+ luci_builder=builder,
schedule_branch=branch,
schedule=schedule,
triggered_gitiles=trigger,
diff --git a/config/config_dump.json b/config/config_dump.json
index 821b671..be50bbb 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -71,7 +71,7 @@
"internal": false,
"kernel_afdo_verify": false,
"latest_toolchain": false,
- "luci_builder": "LegacyRelease",
+ "luci_builder": "LTSRelease",
"manifest": "default.xml",
"manifest_branch": null,
"manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
@@ -600,6 +600,7 @@
"display_label": "tryjob",
"hw_tests_override": [],
"internal": true,
+ "luci_builder": "LegacyRelease",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
"manifest_version": true,
"overlays": "both",
@@ -702,6 +703,7 @@
"factory_install"
],
"internal": true,
+ "luci_builder": "LegacyRelease",
"manifest": "official.xml",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
"manifest_version": true,
@@ -783,6 +785,7 @@
"factory_install"
],
"internal": true,
+ "luci_builder": "LegacyRelease",
"manifest": "official.xml",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
"manifest_version": true,
diff --git a/config/luci-scheduler.cfg b/config/luci-scheduler.cfg
index b304689..f98d985 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/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 {
@@ -53,9 +53,9 @@
schedule: "with 5m interval"
gitiles: {
repo: "https://chromium.googlesource.com/chromium/src"
- refs: "regexp:refs/tags/84\\..*"
+ refs: "regexp:refs/tags/86\\..*"
}
- triggers: "release-R84-13099.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ triggers: "release-R86-13421.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/85\\..*"
+ refs: "regexp:refs/tags/87\\..*"
}
- triggers: "release-R85-13310.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ triggers: "release-R87-13505.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
}
trigger {
@@ -109,10 +109,46 @@
schedule: "with 5m interval"
gitiles: {
repo: "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay"
- refs: "regexp:refs/heads/release-R83-13020.B\\..*"
- path_regexps: "chromeos-base/chromeos-chrome/chromeos-chrome-83.*.ebuild"
+ refs: "regexp:refs/heads/release-R84-13099.B\\..*"
+ path_regexps: "chromeos-base/chromeos-chrome/chromeos-chrome-84.*.ebuild"
}
- triggers: "release-R83-13020.B-master-release"
+ triggers: "release-R84-13099.B-master-release"
+}
+
+trigger {
+ id: "trigger_8"
+ acl_sets: "default"
+ schedule: "with 5m interval"
+ gitiles: {
+ repo: "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay"
+ refs: "regexp:refs/heads/release-R86-13421.B\\..*"
+ path_regexps: "chromeos-base/chromeos-chrome/chromeos-chrome-86.*.ebuild"
+ }
+ triggers: "release-R86-13421.B-master-release"
+}
+
+trigger {
+ id: "trigger_9"
+ acl_sets: "default"
+ schedule: "with 5m interval"
+ gitiles: {
+ repo: "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay"
+ refs: "regexp:refs/heads/release-R87-13505.B\\..*"
+ path_regexps: "chromeos-base/chromeos-chrome/chromeos-chrome-87.*.ebuild"
+ }
+ triggers: "release-R87-13505.B-master-release"
+}
+
+trigger {
+ id: "trigger_10"
+ acl_sets: "default"
+ schedule: "with 5m interval"
+ gitiles: {
+ repo: "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay"
+ refs: "regexp:refs/heads/release-R88-13597.B\\..*"
+ path_regexps: "chromeos-base/chromeos-chrome/chromeos-chrome-88.*.ebuild"
+ }
+ triggers: "release-R88-13597.B-master-release"
}
job {
@@ -2550,17 +2586,17 @@
}
job {
- id: "release-R85-13310.B-master-release"
+ id: "release-R88-13597.B-master-release"
acl_sets: "default"
- schedule: "0 6 * * *"
+ schedule: "triggered"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R88-13597.B"
tags: "cbb_config:master-release"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R88-13597.B"
properties: "cbb_config:master-release"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2568,17 +2604,17 @@
}
job {
- id: "release-R85-13310.B-grunt-android-pi-pre-flight-branch"
+ id: "release-R88-13597.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: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R88-13597.B"
tags: "cbb_config:grunt-android-pi-pre-flight-branch"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R88-13597.B"
properties: "cbb_config:grunt-android-pi-pre-flight-branch"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2586,17 +2622,53 @@
}
job {
- id: "release-R85-13310.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ id: "release-R87-13505.B-master-release"
acl_sets: "default"
schedule: "triggered"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
+ tags: "cbb_config:master-release"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R87-13505.B"
+ properties: "cbb_config:master-release"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R87-13505.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: "LegacyRelease"
+ tags: "cbb_branch:release-R87-13505.B"
+ tags: "cbb_config:grunt-android-pi-pre-flight-branch"
+ tags: "cbb_display_label:release"
+ properties: "cbb_branch:release-R87-13505.B"
+ properties: "cbb_config:grunt-android-pi-pre-flight-branch"
+ properties: "cbb_display_label:release"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
+ id: "release-R87-13505.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: "LegacyRelease"
+ tags: "cbb_branch:release-R87-13505.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_branch:release-R87-13505.B"
properties: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2604,17 +2676,17 @@
}
job {
- id: "release-R85-13310.B-orderfile-generate-toolchain"
+ id: "release-R87-13505.B-orderfile-generate-toolchain"
acl_sets: "default"
schedule: "0 8/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
tags: "cbb_config:orderfile-generate-toolchain"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R87-13505.B"
properties: "cbb_config:orderfile-generate-toolchain"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2622,17 +2694,17 @@
}
job {
- id: "release-R85-13310.B-orderfile-verify-toolchain"
+ id: "release-R87-13505.B-orderfile-verify-toolchain"
acl_sets: "default"
schedule: "0 0/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
tags: "cbb_config:orderfile-verify-toolchain"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R87-13505.B"
properties: "cbb_config:orderfile-verify-toolchain"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2640,17 +2712,17 @@
}
job {
- id: "release-R85-13310.B-benchmark-afdo-generate"
+ id: "release-R87-13505.B-benchmark-afdo-generate"
acl_sets: "default"
schedule: "0 8/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
tags: "cbb_config:benchmark-afdo-generate"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R87-13505.B"
properties: "cbb_config:benchmark-afdo-generate"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2658,17 +2730,17 @@
}
job {
- id: "release-R85-13310.B-chrome-silvermont-release-afdo-verify"
+ id: "release-R87-13505.B-chrome-silvermont-release-afdo-verify"
acl_sets: "default"
schedule: "0 3/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
tags: "cbb_config:chrome-silvermont-release-afdo-verify"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R87-13505.B"
properties: "cbb_config:chrome-silvermont-release-afdo-verify"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2676,17 +2748,17 @@
}
job {
- id: "release-R85-13310.B-chrome-airmont-release-afdo-verify"
+ id: "release-R87-13505.B-chrome-airmont-release-afdo-verify"
acl_sets: "default"
schedule: "0 3/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
tags: "cbb_config:chrome-airmont-release-afdo-verify"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R87-13505.B"
properties: "cbb_config:chrome-airmont-release-afdo-verify"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2694,17 +2766,17 @@
}
job {
- id: "release-R85-13310.B-chrome-broadwell-release-afdo-verify"
+ id: "release-R87-13505.B-chrome-broadwell-release-afdo-verify"
acl_sets: "default"
schedule: "0 3/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
builder: "LegacyRelease"
- tags: "cbb_branch:release-R85-13310.B"
+ tags: "cbb_branch:release-R87-13505.B"
tags: "cbb_config:chrome-broadwell-release-afdo-verify"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R85-13310.B"
+ properties: "cbb_branch:release-R87-13505.B"
properties: "cbb_config:chrome-broadwell-release-afdo-verify"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2714,7 +2786,7 @@
job {
id: "release-R84-13099.B-master-release"
acl_sets: "default"
- schedule: "0 5 * * *"
+ schedule: "triggered"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
@@ -2874,17 +2946,17 @@
}
job {
- id: "release-R83-13020.B-master-release"
+ id: "release-R86-13421.B-master-release"
acl_sets: "default"
schedule: "triggered"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:master-release"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:master-release"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2892,17 +2964,17 @@
}
job {
- id: "release-R83-13020.B-grunt-android-pi-pre-flight-branch"
+ id: "release-R86-13421.B-grunt-android-pi-pre-flight-branch"
acl_sets: "default"
- schedule: "0 2,6,10,14,18,22 * * *"
+ schedule: "0 3,7,11,15,19,23 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:grunt-android-pi-pre-flight-branch"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:grunt-android-pi-pre-flight-branch"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2910,17 +2982,17 @@
}
job {
- id: "release-R83-13020.B-chell-chrome-no-afdo-uprev-pre-flight-branch"
+ id: "release-R86-13421.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: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:chell-chrome-no-afdo-uprev-pre-flight-branch"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2928,17 +3000,17 @@
}
job {
- id: "release-R83-13020.B-orderfile-generate-toolchain"
+ id: "release-R86-13421.B-orderfile-generate-toolchain"
acl_sets: "default"
schedule: "0 8/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:orderfile-generate-toolchain"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:orderfile-generate-toolchain"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2946,17 +3018,17 @@
}
job {
- id: "release-R83-13020.B-orderfile-verify-toolchain"
+ id: "release-R86-13421.B-orderfile-verify-toolchain"
acl_sets: "default"
schedule: "0 0/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:orderfile-verify-toolchain"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:orderfile-verify-toolchain"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2964,17 +3036,17 @@
}
job {
- id: "release-R83-13020.B-benchmark-afdo-generate"
+ id: "release-R86-13421.B-benchmark-afdo-generate"
acl_sets: "default"
schedule: "0 8/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:benchmark-afdo-generate"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:benchmark-afdo-generate"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -2982,17 +3054,17 @@
}
job {
- id: "release-R83-13020.B-chrome-silvermont-release-afdo-verify"
+ id: "release-R86-13421.B-chrome-silvermont-release-afdo-verify"
acl_sets: "default"
schedule: "0 3/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:chrome-silvermont-release-afdo-verify"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:chrome-silvermont-release-afdo-verify"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -3000,17 +3072,17 @@
}
job {
- id: "release-R83-13020.B-chrome-airmont-release-afdo-verify"
+ id: "release-R86-13421.B-chrome-airmont-release-afdo-verify"
acl_sets: "default"
schedule: "0 3/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:chrome-airmont-release-afdo-verify"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:chrome-airmont-release-afdo-verify"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
@@ -3018,17 +3090,17 @@
}
job {
- id: "release-R83-13020.B-chrome-broadwell-release-afdo-verify"
+ id: "release-R86-13421.B-chrome-broadwell-release-afdo-verify"
acl_sets: "default"
schedule: "0 3/12 * * *"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R83-13020.B"
+ builder: "LTSRelease"
+ tags: "cbb_branch:release-R86-13421.B"
tags: "cbb_config:chrome-broadwell-release-afdo-verify"
tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R83-13020.B"
+ properties: "cbb_branch:release-R86-13421.B"
properties: "cbb_config:chrome-broadwell-release-afdo-verify"
properties: "cbb_display_label:release"
properties: "cbb_extra_args:[\"--buildbot\"]"
diff --git a/lib/config_lib.py b/lib/config_lib.py
index 6632429..056c5c0 100644
--- a/lib/config_lib.py
+++ b/lib/config_lib.py
@@ -80,6 +80,7 @@
LUCI_BUILDER_INFORMATIONAL = 'Informational'
LUCI_BUILDER_INFRA = 'Infra'
LUCI_BUILDER_LEGACY_RELEASE = 'LegacyRelease'
+LUCI_BUILDER_LTS_RELEASE = 'LTSRelease'
LUCI_BUILDER_PFQ = 'PFQ'
LUCI_BUILDER_RAPID = 'Rapid'
LUCI_BUILDER_RELEASE = 'Release'
@@ -93,6 +94,7 @@
LUCI_BUILDER_INFORMATIONAL,
LUCI_BUILDER_INFRA,
LUCI_BUILDER_LEGACY_RELEASE,
+ LUCI_BUILDER_LTS_RELEASE,
LUCI_BUILDER_PFQ,
LUCI_BUILDER_RAPID,
LUCI_BUILDER_RELEASE,
@@ -660,7 +662,7 @@
# https://chrome-internal.git.corp.google.com/chromeos/
# manifest-internal/+/infra/config/cr-buildbucket.cfg
#
- luci_builder=LUCI_BUILDER_LEGACY_RELEASE,
+ luci_builder=LUCI_BUILDER_LTS_RELEASE,
# The profile of the variant to set up and build.
profile=None,
