config: drop veyron-jerry builders
Support for veyron-jerry has been dropped (AUE with M85).
BUG=b:178689388, b:178874302
TEST=refresh
Cq-Depend: chromium:2657720
Change-Id: I93ec4761cbbf144b87d08ef9e0346cb103227da2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2665209
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Auto-Submit: LaMont Jones <lamontjones@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index ec4cdda..f764888 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -1745,7 +1745,7 @@
(MONTHLY, 'firmware-gandof-6301.155.B', ['gandof'], {}),
(MONTHLY, 'firmware-buddy-6301.202.B', ['buddy'], {}),
(MONTHLY, 'firmware-veyron-6588.B', [
- 'veyron_jerry', 'veyron_mighty',
+ 'veyron_mighty',
'veyron_speedy', 'veyron_jaq',
'veyron_minnie',
'veyron_mickey', 'veyron_rialto', 'veyron_tiger',
@@ -1834,7 +1834,7 @@
'gandof', 'buddy']),
(MONTHLY, 'factory-whirlwind-6509.B', ['whirlwind']),
(MONTHLY, 'factory-veyron-6591.B', [
- 'veyron_jerry', 'veyron_mighty',
+ 'veyron_mighty',
'veyron_speedy', 'veyron_jaq',
'veyron_minnie', 'veyron_mickey']),
(MONTHLY, 'factory-auron-6772.B', [
diff --git a/config/chromeos_config_boards.py b/config/chromeos_config_boards.py
index 80dec1f..ef63301 100644
--- a/config/chromeos_config_boards.py
+++ b/config/chromeos_config_boards.py
@@ -34,7 +34,6 @@
'oak',
'tael',
'veyron_jaq',
- 'veyron_jerry',
'veyron_mighty',
'veyron_minnie',
'veyron_rialto',
diff --git a/config/config_dump.json b/config/config_dump.json
index fff32fa..15f9484 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -12604,7 +12604,6 @@
"schedule": "with 720h interval",
"slave_configs": [
"veyron_jaq-factory-veyron-6591.B-factorybranch",
- "veyron_jerry-factory-veyron-6591.B-factorybranch",
"veyron_mickey-factory-veyron-6591.B-factorybranch",
"veyron_mighty-factory-veyron-6591.B-factorybranch",
"veyron_minnie-factory-veyron-6591.B-factorybranch",
@@ -12621,7 +12620,6 @@
"luci_builder": "Try",
"slave_configs": [
"veyron_jaq-factory-veyron-6591.B-factorybranch-tryjob",
- "veyron_jerry-factory-veyron-6591.B-factorybranch-tryjob",
"veyron_mickey-factory-veyron-6591.B-factorybranch-tryjob",
"veyron_mighty-factory-veyron-6591.B-factorybranch-tryjob",
"veyron_minnie-factory-veyron-6591.B-factorybranch-tryjob",
@@ -14236,7 +14234,6 @@
"firmware-veyron-6588.B-firmwarebranch": {
"_template": "firmwarebranch",
"boards": [
- "veyron_jerry",
"veyron_mighty",
"veyron_speedy",
"veyron_jaq",
@@ -14252,7 +14249,6 @@
"firmware-veyron-6588.B-firmwarebranch-tryjob": {
"_template": "firmwarebranch",
"boards": [
- "veyron_jerry",
"veyron_mighty",
"veyron_speedy",
"veyron_jaq",
@@ -35471,179 +35467,6 @@
"chrome_internal"
]
},
- "veyron_jerry-factory-veyron-6591.B-factorybranch": {
- "_template": "factorybranch",
- "boards": [
- "veyron_jerry"
- ],
- "packages": [
- "virtual/target-os",
- "virtual/target-os-dev",
- "virtual/target-os-test",
- "chromeos-base/chromeos-installshim",
- "chromeos-base/chromeos-factory",
- "chromeos-base/chromeos-hwid",
- "chromeos-base/autotest-factory-install",
- "chromeos-base/autotest-all"
- ],
- "workspace_branch": "factory-veyron-6591.B"
- },
- "veyron_jerry-factory-veyron-6591.B-factorybranch-tryjob": {
- "_template": "factorybranch",
- "boards": [
- "veyron_jerry"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try",
- "packages": [
- "virtual/target-os",
- "virtual/target-os-dev",
- "virtual/target-os-test",
- "chromeos-base/chromeos-installshim",
- "chromeos-base/chromeos-factory",
- "chromeos-base/chromeos-hwid",
- "chromeos-base/autotest-factory-install",
- "chromeos-base/autotest-all"
- ],
- "push_image": false,
- "suite_scheduling": false,
- "workspace_branch": "factory-veyron-6591.B"
- },
- "veyron_jerry-full": {
- "_template": "full",
- "boards": [
- "veyron_jerry"
- ],
- "manifest_branch": "main",
- "prebuilts": "public",
- "run_cpeexport": true,
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "veyron_jerry-full-tryjob": {
- "_template": "full",
- "boards": [
- "veyron_jerry"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-informational\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "hw_tests_override": null,
- "luci_builder": "Try",
- "manifest_branch": "main",
- "prebuilts": "public",
- "run_cpeexport": true,
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "veyron_jerry-llvm-next-toolchain": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "veyron_jerry"
- ]
- },
- "veyron_jerry-llvm-next-toolchain-tryjob": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "veyron_jerry"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "veyron_jerry-llvm-toolchain": {
- "_template": "llvm_toolchain",
- "boards": [
- "veyron_jerry"
- ]
- },
- "veyron_jerry-llvm-toolchain-tryjob": {
- "_template": "llvm_toolchain",
- "boards": [
- "veyron_jerry"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "veyron_jerry-payloads": {
- "_template": "payloads",
- "boards": [
- "veyron_jerry"
- ]
- },
- "veyron_jerry-payloads-tryjob": {
- "_template": "payloads",
- "boards": [
- "veyron_jerry"
- ],
- "debug": true,
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "veyron_jerry-release": {
- "_template": "release",
- "boards": [
- "veyron_jerry"
- ],
- "vm_tests": [],
- "vm_tests_override": null
- },
- "veyron_jerry-release-tryjob": {
- "_template": "release",
- "boards": [
- "veyron_jerry"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-informational\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "hw_tests_override": null,
- "luci_builder": "Try",
- "paygen": false,
- "push_image": false,
- "suite_scheduling": false,
- "vm_tests": [],
- "vm_tests_override": null
- },
- "veyron_jerry-unittest-stress": {
- "_template": "unittest_stress",
- "boards": [
- "veyron_jerry"
- ],
- "hw_tests_override": null,
- "internal": true,
- "luci_builder": "Try",
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "overlays": "both",
- "useflags": [
- "chrome_internal"
- ]
- },
"veyron_mickey-factory-veyron-6591.B-factorybranch": {
"_template": "factorybranch",
"boards": [
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 9778140..128a5cb 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -118,7 +118,6 @@
trogdor-factory-trogdor-13443.B-factorybranch
factory-veyron-6591.B-buildspec
veyron_jaq-factory-veyron-6591.B-factorybranch
- veyron_jerry-factory-veyron-6591.B-factorybranch
veyron_mickey-factory-veyron-6591.B-factorybranch
veyron_mighty-factory-veyron-6591.B-factorybranch
veyron_minnie-factory-veyron-6591.B-factorybranch
@@ -994,7 +993,6 @@
trogdor-factory-trogdor-13443.B-factorybranch-tryjob
factory-veyron-6591.B-buildspec-tryjob
veyron_jaq-factory-veyron-6591.B-factorybranch-tryjob
- veyron_jerry-factory-veyron-6591.B-factorybranch-tryjob
veyron_mickey-factory-veyron-6591.B-factorybranch-tryjob
veyron_mighty-factory-veyron-6591.B-factorybranch-tryjob
veyron_minnie-factory-veyron-6591.B-factorybranch-tryjob
@@ -2079,13 +2077,6 @@
veyron_jaq-payloads-tryjob
veyron_jaq-release-tryjob
veyron_jaq-unittest-stress
- veyron_jerry-factory-veyron-6591.B-factorybranch-tryjob
- veyron_jerry-full-tryjob
- veyron_jerry-llvm-next-toolchain-tryjob
- veyron_jerry-llvm-toolchain-tryjob
- veyron_jerry-payloads-tryjob
- veyron_jerry-release-tryjob
- veyron_jerry-unittest-stress
veyron_mickey-factory-veyron-6591.B-factorybranch-tryjob
veyron_mickey-factory-veyron-7505.B-factorybranch-tryjob
veyron_mighty-factory-veyron-6591.B-factorybranch-tryjob
