Revert "chromeos_config: Remove cheets builders from build groups"
This reverts commit 01aa86a55fb3ae0c3a820fb5959bb492ce7ba65f.
BUG=b:25822327
TEST=none (revert, only needs test line because done manually)
Change-Id: Ife23db4fe2a729d727725182e7841057d95c3047
Reviewed-on: https://chromium-review.googlesource.com/314890
Commit-Ready: Elijah Taylor <elijahtaylor@chromium.org>
Tested-by: Elijah Taylor <elijahtaylor@chromium.org>
Reviewed-by: Elijah Taylor <elijahtaylor@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 2e6d261..b5a247b 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -368,6 +368,7 @@
'veyron_mickey',
'veyron_mighty',
'veyron_minnie',
+ 'veyron_minnie-cheets',
'veyron_pinky',
'veyron_rialto',
'veyron_romy',
@@ -396,6 +397,7 @@
'clapper',
'cranky',
'cyan',
+ 'cyan-cheets',
'edgar',
'enguarde',
'expresso',
@@ -546,7 +548,9 @@
_no_unittest_boards = frozenset((
))
-_no_vmtest_boards = _arm_boards | _brillo_boards
+_no_vmtest_boards = _arm_boards | _brillo_boards | frozenset((
+ 'cyan-cheets',
+))
# This is a list of configs that should be included on the main waterfall, but
# aren't included by default (see IsDefaultMainWaterfall). This loosely
@@ -2525,6 +2529,7 @@
_AddGroupConfig(
'veyron-d', 'veyron_shark', (
'veyron_romy',
+ 'veyron_minnie-cheets',
),
)
@@ -2548,6 +2553,7 @@
_AddGroupConfig(
'strago-b', 'reks', (
+ 'cyan-cheets',
'wizpig',
'terra',
),
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 4627941..4534c0f 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -4548,6 +4548,173 @@
"-chrome_internal"
]
},
+ "cyan-cheets-chrome-pfq": {
+ "_template": "chrome-pfq",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "important": false,
+ "manifest": "official.xml",
+ "vm_tests": []
+ },
+ "cyan-cheets-chromium-pfq": {
+ "_template": "chromium-pfq",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "description": "Preflight Chromium Uprev & Build (internal)",
+ "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Chrome-PFQ",
+ "important": false,
+ "internal": true,
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "prebuilts": "public",
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-compile-only-pre-cq": {
+ "_template": "compile-only-pre-cq",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ]
+ },
+ "cyan-cheets-full": {
+ "_template": "full",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "prebuilts": "public",
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-no-vmtest-pre-cq": {
+ "_template": "no-vmtest-pre-cq",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ]
+ },
+ "cyan-cheets-paladin": {
+ "_template": "paladin",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "description": "Commit Queue (internal)",
+ "important": false,
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "prebuilts": "private",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": [],
+ "vm_tests_override": null
+ },
+ "cyan-cheets-payloads": {
+ "_template": "payloads",
+ "boards": [
+ "cyan-cheets"
+ ]
+ },
+ "cyan-cheets-pre-cq": {
+ "_template": "pre-cq",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-release": {
+ "_template": "release",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-release-afdo": {
+ "_template": "release-afdo-generate",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "child_configs": [
+ {
+ "_template": "release-afdo-generate",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "grouped": true,
+ "name": "cyan-cheets-release-afdo-generate",
+ "vm_tests": []
+ },
+ {
+ "_template": "release-afdo-use",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "grouped": true,
+ "name": "cyan-cheets-release-afdo-use",
+ "vm_tests": []
+ }
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-release-afdo-generate": {
+ "_template": "release-afdo-generate",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-release-afdo-use": {
+ "_template": "release-afdo-use",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "vm_tests": []
+ },
+ "cyan-cheets-tot-chrome-pfq-informational": {
+ "_template": "chrome-pfq-informational",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "manifest": "official.xml",
+ "vm_tests": []
+ },
+ "cyan-cheets-tot-chromium-pfq-informational": {
+ "_template": "chromium-pfq-informational",
+ "boards": [
+ "cyan-cheets"
+ ],
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
"cyan-chrome-pfq": {
"_template": "chrome-pfq",
"boards": [
@@ -17562,6 +17729,22 @@
{
"_template": "full",
"boards": [
+ "cyan-cheets"
+ ],
+ "build_packages_in_background": true,
+ "chrome_sdk_build_chrome": false,
+ "grouped": true,
+ "name": "cyan-cheets-full",
+ "prebuilts": "public",
+ "unittests": null,
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ {
+ "_template": "full",
+ "boards": [
"wizpig"
],
"build_packages_in_background": true,
@@ -17592,7 +17775,7 @@
"vm_tests": []
}
],
- "description": "Full Builds; Group config (boards: reks, wizpig, terra)",
+ "description": "Full Builds; Group config (boards: reks, cyan-cheets, wizpig, terra)",
"prebuilts": "public",
"useflags": [
"-chrome_internal"
@@ -17616,6 +17799,18 @@
{
"_template": "release",
"boards": [
+ "cyan-cheets"
+ ],
+ "build_packages_in_background": true,
+ "chrome_sdk_build_chrome": false,
+ "grouped": true,
+ "name": "cyan-cheets-release",
+ "unittests": null,
+ "vm_tests": []
+ },
+ {
+ "_template": "release",
+ "boards": [
"wizpig"
],
"build_packages_in_background": true,
@@ -17638,7 +17833,7 @@
"vm_tests": []
}
],
- "description": "Release Builds (canary) (internal); Group config (boards: reks, wizpig, terra)",
+ "description": "Release Builds (canary) (internal); Group config (boards: reks, cyan-cheets, wizpig, terra)",
"important": true
},
"strago-c-full-group": {
@@ -19710,9 +19905,25 @@
"-chrome_internal"
],
"vm_tests": []
+ },
+ {
+ "_template": "full",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "build_packages_in_background": true,
+ "chrome_sdk_build_chrome": false,
+ "grouped": true,
+ "name": "veyron_minnie-cheets-full",
+ "prebuilts": "public",
+ "unittests": null,
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
}
],
- "description": "Full Builds; Group config (boards: veyron_shark, veyron_romy)",
+ "description": "Full Builds; Group config (boards: veyron_shark, veyron_romy, veyron_minnie-cheets)",
"prebuilts": "public",
"useflags": [
"-chrome_internal"
@@ -19746,9 +19957,21 @@
"name": "veyron_romy-release",
"unittests": null,
"vm_tests": []
+ },
+ {
+ "_template": "release",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "build_packages_in_background": true,
+ "chrome_sdk_build_chrome": false,
+ "grouped": true,
+ "name": "veyron_minnie-cheets-release",
+ "unittests": null,
+ "vm_tests": []
}
],
- "description": "Release Builds (canary) (internal); Group config (boards: veyron_shark, veyron_romy)",
+ "description": "Release Builds (canary) (internal); Group config (boards: veyron_shark, veyron_romy, veyron_minnie-cheets)",
"important": true,
"vm_tests": []
},
@@ -21070,6 +21293,173 @@
],
"vm_tests": []
},
+ "veyron_minnie-cheets-chrome-pfq": {
+ "_template": "chrome-pfq",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "important": false,
+ "manifest": "official.xml",
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-chromium-pfq": {
+ "_template": "chromium-pfq",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "description": "Preflight Chromium Uprev & Build (internal)",
+ "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Chrome-PFQ",
+ "important": false,
+ "internal": true,
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "prebuilts": "public",
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-compile-only-pre-cq": {
+ "_template": "compile-only-pre-cq",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ]
+ },
+ "veyron_minnie-cheets-full": {
+ "_template": "full",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "prebuilts": "public",
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-no-vmtest-pre-cq": {
+ "_template": "no-vmtest-pre-cq",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ]
+ },
+ "veyron_minnie-cheets-paladin": {
+ "_template": "paladin",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "description": "Commit Queue (internal)",
+ "important": false,
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "prebuilts": "private",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": [],
+ "vm_tests_override": null
+ },
+ "veyron_minnie-cheets-payloads": {
+ "_template": "payloads",
+ "boards": [
+ "veyron_minnie-cheets"
+ ]
+ },
+ "veyron_minnie-cheets-pre-cq": {
+ "_template": "pre-cq",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-release": {
+ "_template": "release",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-release-afdo": {
+ "_template": "release-afdo-generate",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "child_configs": [
+ {
+ "_template": "release-afdo-generate",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "grouped": true,
+ "name": "veyron_minnie-cheets-release-afdo-generate",
+ "vm_tests": []
+ },
+ {
+ "_template": "release-afdo-use",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "grouped": true,
+ "name": "veyron_minnie-cheets-release-afdo-use",
+ "vm_tests": []
+ }
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-release-afdo-generate": {
+ "_template": "release-afdo-generate",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-release-afdo-use": {
+ "_template": "release-afdo-use",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-tot-chrome-pfq-informational": {
+ "_template": "chrome-pfq-informational",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "manifest": "official.xml",
+ "vm_tests": []
+ },
+ "veyron_minnie-cheets-tot-chromium-pfq-informational": {
+ "_template": "chromium-pfq-informational",
+ "boards": [
+ "veyron_minnie-cheets"
+ ],
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
"veyron_minnie-chrome-pfq": {
"_template": "chrome-pfq",
"boards": [
