Update config settings by config-updater.
Change-Id: I2fe80e855340588cbbc03cfb6d36f62fe16d0ab4
diff --git a/config/config_dump.json b/config/config_dump.json
index c26e9ae..d18b38d 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -16746,7 +16746,6 @@
"swanky-release",
"terra-release",
"tidus-release",
- "trogdor-release",
"ultima-release",
"veyron_fievel-release",
"veyron_mickey-release",
@@ -16904,7 +16903,6 @@
"swanky-release-tryjob",
"terra-release-tryjob",
"tidus-release-tryjob",
- "trogdor-release-tryjob",
"ultima-release-tryjob",
"veyron_fievel-release-tryjob",
"veyron_mickey-release-tryjob",
@@ -24533,149 +24531,6 @@
"chrome_internal"
]
},
- "trogdor-full": {
- "_template": "full",
- "boards": [
- "trogdor"
- ],
- "prebuilts": "public",
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "trogdor-full-tryjob": {
- "_template": "full",
- "boards": [
- "trogdor"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests": [
- "{\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-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\": 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-arc\",\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-tast-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-tast-informational\",\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\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"CQ\",\n \"quota_account\": \"bvt-sync\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\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-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",
- "prebuilts": "public",
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "trogdor-llvm-next-toolchain": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "trogdor"
- ]
- },
- "trogdor-llvm-next-toolchain-tryjob": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "trogdor"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "trogdor-llvm-toolchain": {
- "_template": "llvm_toolchain",
- "boards": [
- "trogdor"
- ]
- },
- "trogdor-llvm-toolchain-tryjob": {
- "_template": "llvm_toolchain",
- "boards": [
- "trogdor"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "trogdor-payloads": {
- "_template": "payloads",
- "boards": [
- "trogdor"
- ]
- },
- "trogdor-payloads-tryjob": {
- "_template": "payloads",
- "boards": [
- "trogdor"
- ],
- "debug": true,
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "trogdor-release": {
- "_template": "release",
- "boards": [
- "trogdor"
- ],
- "hw_tests": [],
- "hw_tests_disabled_bug": "b/152055929",
- "hw_tests_override": [],
- "models": [
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"trogdor\",\n \"name\": \"lazor\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-tast-cq\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"bvt-tast-informational\"\n ]\n}",
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"trogdor\",\n \"name\": \"pompom\",\n \"test_suites\": []\n}",
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"trogdor\",\n \"name\": \"trogdor\",\n \"test_suites\": []\n}"
- ],
- "sign_types": [
- "recovery",
- "factory"
- ],
- "vm_tests": [],
- "vm_tests_override": null
- },
- "trogdor-release-tryjob": {
- "_template": "release",
- "boards": [
- "trogdor"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests": [],
- "hw_tests_disabled_bug": "b/152055929",
- "hw_tests_override": null,
- "luci_builder": "Try",
- "models": [
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"trogdor\",\n \"name\": \"lazor\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-tast-cq\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"bvt-tast-informational\"\n ]\n}",
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"trogdor\",\n \"name\": \"pompom\",\n \"test_suites\": []\n}",
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"trogdor\",\n \"name\": \"trogdor\",\n \"test_suites\": []\n}"
- ],
- "paygen": false,
- "push_image": false,
- "sign_types": [
- "recovery",
- "factory"
- ],
- "suite_scheduling": false,
- "vm_tests": [],
- "vm_tests_override": null
- },
- "trogdor-unittest-stress": {
- "_template": "unittest_stress",
- "boards": [
- "trogdor"
- ],
- "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"
- ]
- },
"ultima-factory-strago-7458.B-factorybranch": {
"_template": "factorybranch",
"boards": [
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index 4632328..c847a4a 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -3897,50 +3897,6 @@
]
},
{
- "name": "trogdor",
- "reference_board_name": "trogdor",
- "arch": "ARM_INTERNAL",
- "builder": "RELEASE",
- "experimental": false,
- "models": [
- {
- "board_name": "trogdor",
- "name": "lazor",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-tast-cq",
- "bvt-installer",
- "bvt-arc",
- "au",
- "bvt-cq",
- "bvt-perbuild",
- "bvt-tast-informational"
- ],
- "cq_test_enabled": true,
- "release_builder_test_pool": "bvt",
- "board_id": 418,
- "is_active": true
- },
- {
- "board_name": "trogdor",
- "name": "pompom",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt",
- "board_id": 418,
- "is_active": true
- },
- {
- "board_name": "trogdor",
- "name": "trogdor",
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt",
- "board_id": 418,
- "is_active": true
- }
- ]
- },
- {
"name": "volteer",
"reference_board_name": "volteer",
"arch": "X86_INTERNAL",
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 857a35a..eddab6b 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -322,7 +322,6 @@
swanky-release
terra-release
tidus-release
- trogdor-release
ultima-release
veyron_fievel-release
veyron_mickey-release
@@ -1197,7 +1196,6 @@
swanky-release-tryjob
terra-release-tryjob
tidus-release-tryjob
- trogdor-release-tryjob
ultima-release-tryjob
veyron_fievel-release-tryjob
veyron_mickey-release-tryjob
@@ -1513,12 +1511,6 @@
tidus-payloads-tryjob
tidus-release-tryjob
tidus-unittest-stress
- trogdor-full-tryjob
- trogdor-llvm-next-toolchain-tryjob
- trogdor-llvm-toolchain-tryjob
- trogdor-payloads-tryjob
- trogdor-release-tryjob
- trogdor-unittest-stress
ultima-factory-strago-7458.B-factorybranch-tryjob
ultima-full-tryjob
ultima-llvm-next-toolchain-tryjob