endeavour: add factory branch builder
Also remove old factory signing from excelsior release.
BUG=b:151738283, b:149569720
TEST=./refresh_generated_files
Change-Id: Ib1b6d8f41ad611d86bd09235ddedb2cbd6a76a4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2255418
Tested-by: Jeff Chase <jnchase@google.com>
Auto-Submit: Jeff Chase <jnchase@google.com>
Reviewed-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 240ad6f..9da3dc1 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -1974,6 +1974,7 @@
(WEEKLY, 'factory-hatch-12692.B', ['hatch']),
(WEEKLY, 'factory-excelsior-12812.B', ['excelsior']),
(WEEKLY, 'factory-drallion-13080.B', ['drallion']),
+ (WEEKLY, 'factory-endeavour-13295.B', ['endeavour']),
# This is intended to create master branch tryjobs, NOT for production
# builds. Update the associated list of boards as needed.
(None, 'master', ['atlas', 'octopus', 'rammus', 'coral', 'eve',
@@ -2669,10 +2670,6 @@
'sign_types': ['recovery', 'factory'],
},
- 'excelsior-release': {
- 'sign_types': ['recovery', 'factory'],
- },
-
'sarien-release': {
'sign_types': ['recovery', 'factory'],
},
diff --git a/config/config_dump.json b/config/config_dump.json
index 8e11e25..cbc28e1 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -9314,6 +9314,26 @@
"chrome_internal"
]
},
+ "endeavour-factory-endeavour-13295.B-factorybranch": {
+ "_template": "factorybranch",
+ "boards": [
+ "endeavour"
+ ],
+ "workspace_branch": "factory-endeavour-13295.B"
+ },
+ "endeavour-factory-endeavour-13295.B-factorybranch-tryjob": {
+ "_template": "factorybranch",
+ "boards": [
+ "endeavour"
+ ],
+ "debug": true,
+ "display_label": "tryjob",
+ "hw_tests_override": null,
+ "luci_builder": "Try",
+ "push_image": false,
+ "suite_scheduling": false,
+ "workspace_branch": "factory-endeavour-13295.B"
+ },
"endeavour-full": {
"_template": "full",
"boards": [
@@ -10821,10 +10841,6 @@
"models": [
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"excelsior\",\n \"name\": \"excelsior\",\n \"test_suites\": []\n}"
],
- "sign_types": [
- "recovery",
- "factory"
- ],
"vm_tests": [],
"vm_tests_override": null
},
@@ -10851,10 +10867,6 @@
],
"paygen": false,
"push_image": false,
- "sign_types": [
- "recovery",
- "factory"
- ],
"suite_scheduling": false,
"vm_tests": [],
"vm_tests_override": null
@@ -11165,6 +11177,28 @@
],
"workspace_branch": "factory-drallion-13080.B"
},
+ "factory-endeavour-13295.B-buildspec": {
+ "_template": "buildspec",
+ "build_timeout": 43200,
+ "display_label": "factory",
+ "schedule": "with 168h interval",
+ "slave_configs": [
+ "endeavour-factory-endeavour-13295.B-factorybranch"
+ ],
+ "workspace_branch": "factory-endeavour-13295.B"
+ },
+ "factory-endeavour-13295.B-buildspec-tryjob": {
+ "_template": "buildspec",
+ "build_timeout": 43200,
+ "debug": true,
+ "debug_cidb": true,
+ "display_label": "tryjob",
+ "luci_builder": "Try",
+ "slave_configs": [
+ "endeavour-factory-endeavour-13295.B-factorybranch-tryjob"
+ ],
+ "workspace_branch": "factory-endeavour-13295.B"
+ },
"factory-eve-9667.B-buildspec": {
"_template": "buildspec",
"build_timeout": 43200,
diff --git a/config/luci-scheduler.cfg b/config/luci-scheduler.cfg
index 97ec661..48b6fe2 100644
--- a/config/luci-scheduler.cfg
+++ b/config/luci-scheduler.cfg
@@ -353,6 +353,26 @@
}
job {
+ id: "factory-endeavour-13295.B-buildspec"
+ acl_sets: "default"
+ schedule: "with 168h interval"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "Factory"
+ tags: "cbb_branch:master"
+ tags: "cbb_config:factory-endeavour-13295.B-buildspec"
+ tags: "cbb_display_label:factory"
+ tags: "cbb_workspace_branch:factory-endeavour-13295.B"
+ properties: "cbb_branch:master"
+ properties: "cbb_config:factory-endeavour-13295.B-buildspec"
+ properties: "cbb_display_label:factory"
+ properties: "cbb_workspace_branch:factory-endeavour-13295.B"
+ properties: "cbb_extra_args:[\"--buildbot\"]"
+ }
+}
+
+job {
id: "factory-eve-9667.B-buildspec"
acl_sets: "default"
schedule: "with 720h interval"
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index ad6d747..72cc020 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -16,6 +16,8 @@
coral-factory-coral-10122.B-factorybranch
factory-drallion-13080.B-buildspec
drallion-factory-drallion-13080.B-factorybranch
+ factory-endeavour-13295.B-buildspec
+ endeavour-factory-endeavour-13295.B-factorybranch
factory-eve-9667.B-buildspec
eve-factory-eve-9667.B-factorybranch
factory-excelsior-12812.B-buildspec
@@ -748,6 +750,7 @@
elm-payloads-tryjob
elm-release-tryjob
elm-unittest-stress
+ endeavour-factory-endeavour-13295.B-factorybranch-tryjob
endeavour-full-tryjob
endeavour-llvm-next-toolchain-tryjob
endeavour-llvm-toolchain-tryjob
@@ -841,6 +844,8 @@
coral-factory-coral-10122.B-factorybranch-tryjob
factory-drallion-13080.B-buildspec-tryjob
drallion-factory-drallion-13080.B-factorybranch-tryjob
+ factory-endeavour-13295.B-buildspec-tryjob
+ endeavour-factory-endeavour-13295.B-factorybranch-tryjob
factory-eve-9667.B-buildspec-tryjob
eve-factory-eve-9667.B-factorybranch-tryjob
factory-excelsior-12812.B-buildspec-tryjob
