chromeos_config: Move boards to NYC Android PFQ.
Now samus/cyan/veyron_minnie are configured to use Android NYC, so
they are moved to Android NYC PFQ. veyron_tiger is added to
Android MNC PFQ instead.
CQ-DEPEND=CL:525895
BUG=b:62355957
TEST=cbuildbot/run_tests
Change-Id: Ib92432729262187bbe422310f3ac4cb1a3be2408
Reviewed-on: https://chromium-review.googlesource.com/526172
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Trybot-Ready: Bernie Thompson <bhthompson@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 74e826b..52cca51 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -2061,15 +2061,16 @@
)
_mnc_hwtest_boards = frozenset([
- 'cyan',
- 'samus',
- 'veyron_minnie',
])
_mnc_no_hwtest_boards = frozenset([
+ 'veyron_tiger',
])
_nyc_hwtest_boards = frozenset([
'caroline',
+ 'cyan',
+ 'samus',
'veyron_jaq',
+ 'veyron_minnie',
])
_nyc_no_hwtest_boards = frozenset([
'reef',
diff --git a/cbuildbot/chromeos_config_unittest.py b/cbuildbot/chromeos_config_unittest.py
index 1dd09fe..0d38fb2 100644
--- a/cbuildbot/chromeos_config_unittest.py
+++ b/cbuildbot/chromeos_config_unittest.py
@@ -564,9 +564,6 @@
# TODO(dgarrett): Remove after crbug.com/679022
failures.discard('veyron_jerry-chromium-pfq')
- # TODO(dgarrett): Remove after crbug.com/711546
- failures.discard('glados-cheets-android-pfq')
-
if failures:
self.fail("Some active PFQ configs don't have active Paladins: %s" % (
', '.join(sorted(failures))))
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index c89e79e..86ab2f2 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -6144,27 +6144,6 @@
"cyan"
]
},
- "cyan-android-pfq": {
- "_template": "android_pfq",
- "active_waterfall": "chromeos",
- "boards": [
- "cyan"
- ],
- "buildslave_type": "baremetal",
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 3,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"arc-bvt-cq\",\n \"suite_min_duts\": 3,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "internal": true,
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "useflags": [
- "chrome_internal"
- ],
- "vm_tests": [
- "{\n \"test_type\": \"smoke_suite\",\n \"timeout\": 3600\n}"
- ]
- },
"cyan-chrome-pfq": {
"_template": "chrome_pfq",
"active_waterfall": "chromeos",
@@ -6269,6 +6248,27 @@
"{\n \"test_type\": \"smoke_suite\",\n \"timeout\": 3600\n}"
]
},
+ "cyan-nyc-android-pfq": {
+ "_template": "nyc_android_pfq",
+ "active_waterfall": "chromeos",
+ "boards": [
+ "cyan"
+ ],
+ "buildslave_type": "baremetal",
+ "hw_tests": [
+ "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 3,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"arc-bvt-cq\",\n \"suite_min_duts\": 3,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": [
+ "{\n \"test_type\": \"smoke_suite\",\n \"timeout\": 3600\n}"
+ ]
+ },
"cyan-paladin": {
"_template": "paladin",
"active_waterfall": "chromeos",
@@ -14038,9 +14038,7 @@
"master": true,
"push_overlays": "both",
"slave_configs": [
- "cyan-android-pfq",
- "samus-android-pfq",
- "veyron_minnie-android-pfq"
+ "veyron_tiger-android-pfq"
],
"vm_tests": []
},
@@ -14091,8 +14089,11 @@
"push_overlays": "both",
"slave_configs": [
"caroline-nyc-android-pfq",
+ "cyan-nyc-android-pfq",
"reef-nyc-android-pfq",
- "veyron_jaq-nyc-android-pfq"
+ "samus-nyc-android-pfq",
+ "veyron_jaq-nyc-android-pfq",
+ "veyron_minnie-nyc-android-pfq"
],
"vm_tests": []
},
@@ -19901,24 +19902,6 @@
"chrome_internal"
]
},
- "samus-android-pfq": {
- "_template": "android_pfq",
- "active_waterfall": "chromeos",
- "boards": [
- "samus"
- ],
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 3,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"arc-bvt-cq\",\n \"suite_min_duts\": 3,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "internal": true,
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "useflags": [
- "chrome_internal"
- ],
- "vm_tests": []
- },
"samus-chrome-pfq": {
"_template": "chrome_pfq",
"boards": [
@@ -20020,6 +20003,24 @@
"chrome_internal"
]
},
+ "samus-nyc-android-pfq": {
+ "_template": "nyc_android_pfq",
+ "active_waterfall": "chromeos",
+ "boards": [
+ "samus"
+ ],
+ "hw_tests": [
+ "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 3,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"arc-bvt-cq\",\n \"suite_min_duts\": 3,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": []
+ },
"samus-paladin": {
"_template": "paladin",
"active_waterfall": "chromeos",
@@ -25150,24 +25151,6 @@
"chrome_internal"
]
},
- "veyron_minnie-android-pfq": {
- "_template": "android_pfq",
- "active_waterfall": "chromeos",
- "boards": [
- "veyron_minnie"
- ],
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 3,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"arc-bvt-cq\",\n \"suite_min_duts\": 3,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "internal": true,
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "useflags": [
- "chrome_internal"
- ],
- "vm_tests": []
- },
"veyron_minnie-chrome-pfq": {
"_template": "chrome_pfq",
"active_waterfall": "chromeos",
@@ -25229,6 +25212,24 @@
"chrome_internal"
]
},
+ "veyron_minnie-nyc-android-pfq": {
+ "_template": "nyc_android_pfq",
+ "active_waterfall": "chromeos",
+ "boards": [
+ "veyron_minnie"
+ ],
+ "hw_tests": [
+ "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 3,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PFQ\",\n \"retry\": true,\n \"suite\": \"arc-bvt-cq\",\n \"suite_min_duts\": 3,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": []
+ },
"veyron_minnie-paladin": {
"_template": "paladin",
"active_waterfall": "chromeos",
@@ -25923,6 +25924,20 @@
],
"vm_tests": []
},
+ "veyron_tiger-android-pfq": {
+ "_template": "android_pfq",
+ "active_waterfall": "chromeos",
+ "boards": [
+ "veyron_tiger"
+ ],
+ "internal": true,
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "useflags": [
+ "chrome_internal"
+ ],
+ "vm_tests": []
+ },
"veyron_tiger-chrome-pfq": {
"_template": "chrome_pfq",
"boards": [
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index 27719d1..7a70fbd 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -46,8 +46,8 @@
cobblepot-paladin (gce_beefy)
coral-paladin (gce_beefy)
coral-release (gce_beefy)
-cyan-android-pfq (baremetal)
cyan-chrome-pfq (baremetal)
+cyan-nyc-android-pfq (baremetal)
cyan-paladin (baremetal)
cyan-release (baremetal)
daisy-chromium-pfq (gce_beefy)
@@ -163,7 +163,7 @@
relm-release (gce_beefy)
rikku-release (gce_beefy)
rowan-release (gce_beefy)
-samus-android-pfq (gce_beefy)
+samus-nyc-android-pfq (gce_beefy)
samus-paladin (gce_beefy)
samus-release (gce_beefy)
sand-release (gce_beefy)
@@ -199,8 +199,8 @@
veyron_mickey-release (gce_beefy)
veyron_mighty-paladin (gce_beefy)
veyron_mighty-release (gce_beefy)
-veyron_minnie-android-pfq (gce_beefy)
veyron_minnie-chrome-pfq (gce_beefy)
+veyron_minnie-nyc-android-pfq (gce_beefy)
veyron_minnie-paladin (gce_beefy)
veyron_minnie-release (gce_beefy)
veyron_rialto-chrome-pfq (gce_beefy)
@@ -208,6 +208,7 @@
veyron_rialto-release (gce_beefy)
veyron_speedy-paladin (gce_beefy)
veyron_speedy-release (gce_beefy)
+veyron_tiger-android-pfq (gce_beefy)
veyron_tiger-paladin (gce_beefy)
veyron_tiger-release (gce_beefy)
whirlwind-paladin (gce_beefy)
