chromeos_config: Remove references to Release and CQ
Fix builder references in legacy config to ensure we're targeting the
proper builders and, as a result, the proper bot groups.
Additionally, remove as many references to paladin builders, as they
represent old CQ and are no longer relevant.
BUG=b:163569983
TEST='run_tests'
Change-Id: I50e7689ff4cedd38a0d997193d82bc5024832408
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2350075
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
diff --git a/scripts/gen_luci_scheduler_unittest.py b/scripts/gen_luci_scheduler_unittest.py
index 1f543b3..4ece1a8 100644
--- a/scripts/gen_luci_scheduler_unittest.py
+++ b/scripts/gen_luci_scheduler_unittest.py
@@ -38,18 +38,18 @@
expected = """
job {
- id: "amd64-generic-paladin"
+ id: "amd64-generic-release"
acl_sets: "default"
schedule: "funky schedule"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "Prod"
+ builder: "LegacyRelease"
tags: "cbb_branch:master"
- tags: "cbb_config:amd64-generic-paladin"
+ tags: "cbb_config:amd64-generic-release"
tags: "cbb_display_label:MockLabel"
properties: "cbb_branch:master"
- properties: "cbb_config:amd64-generic-paladin"
+ properties: "cbb_config:amd64-generic-release"
properties: "cbb_display_label:MockLabel"
properties: "cbb_extra_args:[\\"--buildbot\\"]"
}
@@ -123,18 +123,18 @@
expected = """
job {
- id: "mock_branch-amd64-generic-paladin"
+ id: "mock_branch-amd64-generic-release"
acl_sets: "default"
schedule: "funky schedule"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "Prod"
+ builder: "LegacyRelease"
tags: "cbb_branch:mock_branch"
- tags: "cbb_config:amd64-generic-paladin"
+ tags: "cbb_config:amd64-generic-release"
tags: "cbb_display_label:MockLabel"
properties: "cbb_branch:mock_branch"
- properties: "cbb_config:amd64-generic-paladin"
+ properties: "cbb_config:amd64-generic-release"
properties: "cbb_display_label:MockLabel"
properties: "cbb_extra_args:[\\"--buildbot\\"]"
}
@@ -153,19 +153,19 @@
expected = """
job {
- id: "amd64-generic-paladin"
+ id: "amd64-generic-release"
acl_sets: "default"
schedule: "funky schedule"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "Prod"
+ builder: "LegacyRelease"
tags: "cbb_branch:master"
- tags: "cbb_config:amd64-generic-paladin"
+ tags: "cbb_config:amd64-generic-release"
tags: "cbb_display_label:MockLabel"
tags: "cbb_workspace_branch:work_branch"
properties: "cbb_branch:master"
- properties: "cbb_config:amd64-generic-paladin"
+ properties: "cbb_config:amd64-generic-release"
properties: "cbb_display_label:MockLabel"
properties: "cbb_workspace_branch:work_branch"
properties: "cbb_extra_args:[\\"--buildbot\\"]"
@@ -185,19 +185,19 @@
expected = """
job {
- id: "amd64-generic-paladin"
+ id: "amd64-generic-release"
acl_sets: "default"
schedule: "funky schedule"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "Prod"
+ builder: "LegacyRelease"
tags: "cbb_branch:master"
- tags: "cbb_config:amd64-generic-paladin"
+ tags: "cbb_config:amd64-generic-release"
tags: "cbb_display_label:MockLabel"
tags: "cbb_goma_client_type:client_type"
properties: "cbb_branch:master"
- properties: "cbb_config:amd64-generic-paladin"
+ properties: "cbb_config:amd64-generic-release"
properties: "cbb_display_label:MockLabel"
properties: "cbb_goma_client_type:client_type"
properties: "cbb_extra_args:[\\"--buildbot\\"]"
@@ -214,13 +214,13 @@
site_config.Add(
'not_scheduled',
- luci_builder='ProdBuilder',
+ luci_builder='ReleaseBuilder',
display_label='MockLabel',
)
site_config.Add(
'build_prod',
- luci_builder='ProdBuilder',
+ luci_builder='ReleaseBuilder',
display_label='MockLabel',
schedule='run once in a while',
)
@@ -234,7 +234,7 @@
site_config.Add(
'build_triggered_a',
- luci_builder='ProdBuilder',
+ luci_builder='ReleaseBuilder',
display_label='MockLabel',
schedule='triggered',
triggered_gitiles=[[
@@ -338,7 +338,7 @@
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "ProdBuilder"
+ builder: "ReleaseBuilder"
tags: "cbb_branch:master"
tags: "cbb_config:build_prod"
tags: "cbb_display_label:MockLabel"
@@ -374,7 +374,7 @@
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromeos.general"
- builder: "ProdBuilder"
+ builder: "ReleaseBuilder"
tags: "cbb_branch:master"
tags: "cbb_config:build_triggered_a"
tags: "cbb_display_label:MockLabel"