Update config settings by config-updater.
Change-Id: I556a74154dbbcfabbe70d1bffb7f9c41f4e2ad14
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 7741904..e143ffb 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -28834,27 +28834,9 @@
},
"grunt-release": {
"_template": "release",
- "active_waterfall": "chromeos_release",
"boards": [
"grunt"
],
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\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 \"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 \"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 \"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 \"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 \"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\": true,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"cts\",\n \"priority\": 11,\n \"retry\": true,\n \"suite\": \"arc-cts-follower\",\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 \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"cts\",\n \"priority\": 11,\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 \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"cts\",\n \"priority\": 11,\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}"
- ],
- "important": true,
- "models": [
- "{\n \"lab_board_name\": \"grunt\",\n \"name\": \"aleena\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-follower\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"grunt\",\n \"name\": \"careena\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-follower\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"grunt\",\n \"name\": \"grunt\",\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-follower\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}"
- ],
"vm_tests": [],
"vm_tests_override": null
},
@@ -28994,13 +28976,7 @@
"{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"suites\",\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}"
],
"hw_tests_override": null,
- "important": true,
"luci_builder": "Try",
- "models": [
- "{\n \"lab_board_name\": \"grunt\",\n \"name\": \"aleena\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-follower\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"grunt\",\n \"name\": \"careena\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"arc-cts-follower\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}",
- "{\n \"lab_board_name\": \"grunt\",\n \"name\": \"grunt\",\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-follower\",\n \"arc-cts-qual\",\n \"arc-gts-qual\"\n ]\n}"
- ],
"paygen": false,
"push_image": false,
"vm_tests": [],
@@ -42053,7 +42029,6 @@
"gandof-release",
"glimmer-release",
"gnawty-release",
- "grunt-release",
"guado-accelerator-release",
"guado-release",
"guado_moblab-release",
@@ -42187,7 +42162,6 @@
"gandof-release",
"glimmer-release",
"gnawty-release",
- "grunt-release",
"guado-accelerator-release",
"guado-release",
"guado_moblab-release",
diff --git a/cbuildbot/ge_build_config.json b/cbuildbot/ge_build_config.json
index e87dc05..f222eac 100644
--- a/cbuildbot/ge_build_config.json
+++ b/cbuildbot/ge_build_config.json
@@ -1437,58 +1437,6 @@
]
},
{
- "name": "grunt",
- "reference_board_name": "grunt",
- "arch": "X86_INTERNAL",
- "builder": "RELEASE",
- "experimental": false,
- "models": [
- {
- "board_name": "grunt",
- "name": "aleena",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-installer",
- "bvt-arc",
- "bvt-cq",
- "bvt-perbuild"
- ],
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "grunt",
- "name": "careena",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-installer",
- "bvt-arc",
- "bvt-cq",
- "bvt-perbuild"
- ],
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- },
- {
- "board_name": "grunt",
- "name": "grunt",
- "test_suites": [
- "sanity",
- "bvt-inline",
- "bvt-installer",
- "bvt-arc",
- "au",
- "bvt-cq",
- "bvt-perbuild"
- ],
- "cq_test_enabled": false,
- "release_builder_test_pool": "bvt"
- }
- ]
- },
- {
"name": "nami",
"reference_board_name": "nami",
"arch": "X86_INTERNAL",
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index d5a840d..1d34ddb 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -181,7 +181,6 @@
gandof-release (gce_beefy)
glimmer-release (gce_beefy)
gnawty-release (gce_beefy)
-grunt-release (gce_beefy)
guado-accelerator-release (gce_beefy)
guado-release (gce_beefy)
guado_moblab-release (gce_beefy)
