Update config settings by config-updater.
Change-Id: Idcc594422a8caa41f37125d2e9b3d01fabe1f27e
diff --git a/config/config_dump.json b/config/config_dump.json
index f021cac..a9edd78 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -44344,7 +44344,6 @@
"nyan_big-release",
"nyan_blaze-release",
"nyan_kitty-release",
- "octopus-release",
"orco-release",
"panther-release",
"peach_pi-release",
@@ -44470,7 +44469,6 @@
"nyan_big-release",
"nyan_blaze-release",
"nyan_kitty-release",
- "octopus-release",
"orco-release",
"panther-release",
"peach_pi-release",
@@ -51692,9 +51690,6 @@
"internal": true,
"manifest": "official.xml",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "models": [
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"phaser360\",\n \"test_suites\": null\n}"
- ],
"overlays": "both",
"prebuilts": "private",
"useflags": [
@@ -51724,9 +51719,6 @@
"luci_builder": "Try",
"manifest": "official.xml",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "models": [
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"phaser360\",\n \"test_suites\": null\n}"
- ],
"overlays": "both",
"prebuilts": "private",
"useflags": [
@@ -51760,44 +51752,9 @@
},
"octopus-release": {
"_template": "release",
- "active_waterfall": "go/legoland",
"boards": [
"octopus"
],
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 4,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PostBuild\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\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\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 4,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PostBuild\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 4,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 6,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 4,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PostBuild\",\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\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 4,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PostBuild\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": true,\n \"max_retries\": 5,\n \"minimum_duts\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"cts\",\n \"priority\": \"CTS\",\n \"retry\": true,\n \"suite\": \"arc-cts-qual\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 172800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"cts\",\n \"priority\": \"CTS\",\n \"retry\": true,\n \"suite\": \"arc-gts-qual\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 172800,\n \"warn_only\": false\n}"
- ],
- "models": [
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"ampton\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"apel\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"bip\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"bobba\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"bobba360\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"fleex\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"grabbiter\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"korath\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"meep\",\n \"name\": \"meep\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"mimrock\",\n \"name\": \"mimrock\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"orbatrix\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"phaser\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"phaser360\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"sparky\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"sparky360\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_ampton\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_bobba\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_fleex\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_meep\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_phaser\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"yorp\",\n \"test_suites\": []\n}"
- ],
"sign_types": [
"recovery",
"factory"
@@ -51944,29 +51901,6 @@
],
"hw_tests_override": null,
"luci_builder": "Try",
- "models": [
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"ampton\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"apel\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"bip\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"bobba\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"bobba360\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"fleex\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"grabbiter\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"korath\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"meep\",\n \"name\": \"meep\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"mimrock\",\n \"name\": \"mimrock\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"orbatrix\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"phaser\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"phaser360\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"sparky\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"sparky360\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_ampton\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_bobba\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_fleex\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_meep\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"unprovisioned_phaser\",\n \"test_suites\": []\n}",
- "{\n \"lab_board_name\": \"octopus\",\n \"name\": \"yorp\",\n \"test_suites\": []\n}"
- ],
"paygen": false,
"push_image": false,
"sign_types": [
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index 4a723a4..4b674fb 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -1637,168 +1637,6 @@
]
},
{
- "name": "octopus",
- "reference_board_name": "octopus",
- "arch": "X86_INTERNAL",
- "builder": "RELEASE",
- "experimental": false,
- "models": [
- {
- "board_name": "octopus",
- "name": "ampton",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "apel",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "bip",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "bobba",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "bobba360",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "fleex",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "grabbiter",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "korath",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "meep",
- "name": "meep",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-installer",
- "bvt-arc",
- "au",
- "bvt-cq",
- "bvt-perbuild"
- ],
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "mimrock",
- "name": "mimrock",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-installer",
- "bvt-arc",
- "au",
- "bvt-cq",
- "bvt-perbuild"
- ],
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "orbatrix",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "phaser",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "phaser360",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-installer",
- "bvt-arc",
- "au",
- "bvt-cq",
- "bvt-perbuild"
- ],
- "cq_test_enabled": true,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "sparky",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "sparky360",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "unprovisioned_ampton",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "unprovisioned_bobba",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "unprovisioned_fleex",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "unprovisioned_meep",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "unprovisioned_phaser",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "octopus",
- "name": "yorp",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- }
- ]
- },
- {
"name": "reef",
"reference_board_name": "reef",
"arch": "X86_INTERNAL",
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 2b4baf4..2d07322 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -2215,7 +2215,6 @@
octopus-paladin-tryjob (gce_beefy)
octopus-payloads (gce_beefy)
octopus-pre-cq (gce_beefy)
-octopus-release (gce_beefy)
octopus-release-afdo-generate-tryjob (gce_beefy)
[octopus-release-afdo-tryjob] (gce_beefy)
octopus-release-afdo-generate
