Update config settings by config-updater.
Change-Id: Id679863cddc39bbef407718e2af41248fb57dd52
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 6238e66..466df4c 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -9797,11 +9797,9 @@
},
"gru-release": {
"_template": "release",
- "active_waterfall": "chromeos_release",
"boards": [
"gru"
],
- "important": true,
"vm_tests": [],
"vm_tests_override": null
},
@@ -14588,7 +14586,6 @@
"gandof-release",
"glimmer-release",
"gnawty-release",
- "gru-release",
"guado-release",
"guado_moblab-release",
"hana-release",
@@ -14622,7 +14619,6 @@
"reks-release",
"relm-release",
"rikku-release",
- "samus-cheets-release",
"samus-release",
"sentry-release",
"setzer-release",
@@ -14641,7 +14637,6 @@
"veyron_jerry-release",
"veyron_mickey-release",
"veyron_mighty-release",
- "veyron_minnie-cheets-release",
"veyron_minnie-release",
"veyron_rialto-release",
"veyron_speedy-release",
@@ -20067,13 +20062,10 @@
},
"samus-cheets-release": {
"_template": "release",
- "active_waterfall": "chromeos_release",
"boards": [
"samus-cheets"
],
- "chrome_sdk_build_chrome": false,
- "important": true,
- "vm_tests": []
+ "buildslave_type": "baremetal"
},
"samus-cheets-release-afdo": {
"_template": "release_afdo_generate",
@@ -25603,12 +25595,9 @@
},
"veyron_minnie-cheets-release": {
"_template": "release",
- "active_waterfall": "chromeos_release",
"boards": [
"veyron_minnie-cheets"
],
- "chrome_sdk_build_chrome": false,
- "important": true,
"vm_tests": [],
"vm_tests_override": null
},
diff --git a/cbuildbot/ge_build_config.json b/cbuildbot/ge_build_config.json
index 89dfdbc..0cc0c0d 100644
--- a/cbuildbot/ge_build_config.json
+++ b/cbuildbot/ge_build_config.json
@@ -350,18 +350,6 @@
]
},
{
- "name": "gru",
- "configs": [
- {
- "builder": "RELEASE",
- "experimental": false,
- "leader_board": true,
- "board_group": "gru",
- "arch": "ARM_INTERNAL"
- }
- ]
- },
- {
"name": "guado",
"configs": [
{
@@ -770,18 +758,6 @@
]
},
{
- "name": "samus-cheets",
- "configs": [
- {
- "builder": "RELEASE",
- "experimental": false,
- "leader_board": false,
- "board_group": "auron",
- "arch": "X86_INTERNAL"
- }
- ]
- },
- {
"name": "sentry",
"configs": [
{
@@ -998,18 +974,6 @@
]
},
{
- "name": "veyron_minnie-cheets",
- "configs": [
- {
- "builder": "RELEASE",
- "experimental": false,
- "leader_board": false,
- "board_group": "veyron",
- "arch": "ARM_INTERNAL"
- }
- ]
- },
- {
"name": "veyron_rialto",
"configs": [
{
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index ed8796b..31e611e 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -129,7 +129,6 @@
gandof-release (gce_beefy)
glimmer-release (gce_beefy)
gnawty-release (gce_beefy)
-gru-release (gce_beefy)
guado-release (gce_beefy)
guado_moblab-release (gce_beefy)
hana-release (gce_beefy)
@@ -164,7 +163,6 @@
reks-release (gce_beefy)
relm-release (gce_beefy)
rikku-release (gce_beefy)
-samus-cheets-release (gce_beefy)
samus-pre-flight-branch (gce_beefy)
samus-release (gce_beefy)
sentry-release (gce_beefy)
@@ -184,7 +182,6 @@
veyron_jerry-release (gce_beefy)
veyron_mickey-release (gce_beefy)
veyron_mighty-release (gce_beefy)
-veyron_minnie-cheets-release (gce_beefy)
veyron_minnie-release (gce_beefy)
veyron_rialto-release (gce_beefy)
veyron_speedy-release (gce_beefy)
