chromeos_config: Update for R50 release.

BUG=chromium:590289
TEST=`./cbuildbot/chromeos_config_unittest`

Change-Id: I72de4fd5f50b84262e89f7935991ada198a381b5
Reviewed-on: https://chromium-review.googlesource.com/329559
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Josafat Garcia <josafat@chromium.org>
Reviewed-by: Ketaki Deshpande <ketakid@chromium.org>
Commit-Queue: Ketaki Deshpande <ketakid@chromium.org>
Tested-by: Ketaki Deshpande <ketakid@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 5384713..4d24607 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -15,7 +15,7 @@
 
 # Set to 'True' if this is a release branch. This updates the '-release' builder
 # configuration to the shape used by the release waterfall.
-IS_RELEASE_BRANCH = False
+IS_RELEASE_BRANCH = True
 
 
 def OverrideConfigForTrybot(build_config, options):
@@ -595,34 +595,6 @@
     ]),
 
     constants.WATERFALL_INTERNAL: frozenset([
-        # Experimental Paladins.
-        'lakitu_next-paladin',
-        'veyron_rialto-paladin',
-
-        # Experimental Canaries (Group)
-        'glados-release-group',
-        'storm-release-group',
-
-        # Experimental Canaries
-        'amd64-generic-goofy-release',
-        'kayle-release',
-        'kunimitsu-release-group',
-        'lakitu_next-release',
-        'nyan_freon-release',
-        'smaug-release',
-        'strago-c-release-group',
-        'guado_moblab-release',
-
-        # Incremental Builders.
-        'mario-incremental',
-        'lakitu-incremental',
-        'lakitu_next-incremental',
-
-        # Firmware Builders.
-        'link-depthcharge-full-firmware',
-
-        # Toolchain Builders.
-        'internal-toolchain-minor',
     ]),
 
     constants.WATERFALL_RELEASE: frozenset([
@@ -2224,7 +2196,6 @@
   site_config.Add(
       'gizmo-release', _release,
       _base_configs['gizmo'],
-      important=True,
       paygen=False,
       signer_tests=False,
   )
@@ -2292,7 +2263,6 @@
       'panther_embedded-minimal-release', _release,
       _base_configs['panther_embedded'],
       profile='minimal',
-      important=True,
       paygen=False,
       signer_tests=False,
   )
@@ -2314,7 +2284,6 @@
           boards=['beaglebone_servo'],
           payload_image='base'
       ).derive(_grouped_variant_config),
-      important=True,
   )
 
   site_config.Add(
@@ -2378,6 +2347,7 @@
       'cheets-release',
       _release,
       description='Cheets release builders',
+      important=False,
       hw_tests=[
           config_lib.HWTestConfig(constants.HWTEST_COMMIT_SUITE,
                                   blocking=True, num=1, timeout=120*60),
@@ -2438,7 +2408,6 @@
       'lakitu_mobbuild-release', _release,
       _base_configs['lakitu_mobbuild'],
       signer_tests=False,
-      important=True,
   )
 
   site_config.Add(
@@ -2646,7 +2615,6 @@
       'auron', 'auron', (
           'auron_yuna',
           'auron_paine',
-          'samus-cheets',
       ),
   )
 
@@ -2667,26 +2635,13 @@
   )
 
   _AddGroupConfig(
-      'veyron-b', 'veyron_gus', (
-          'veyron_jaq',
+      'veyron-b', 'veyron_jaq', (
           'veyron_minnie',
           'veyron_rialto',
-      ),
-  )
-
-  _AddGroupConfig(
-      'veyron-c', 'veyron_brain', (
-          'veyron_danger',
           'veyron_mickey',
       ),
   )
 
-  _AddGroupConfig(
-      'veyron-d', 'veyron_shark', (
-          'veyron_romy',
-          'veyron_minnie-cheets',
-      ),
-  )
 
   # jecht-based boards
   _AddGroupConfig(
@@ -2708,32 +2663,24 @@
 
   _AddGroupConfig(
       'strago-b', 'reks', (
-          'cyan-cheets',
           'wizpig',
           'terra',
+          'edgar',
       ),
   )
 
-  _AddGroupConfig(
-      'strago-c', 'edgar', (
-          'setzer',
-      ),
-      important=False,
-  )
-
   # oak-based boards
   _AddGroupConfig(
       'oak', 'oak', (
-      )
+      ),
+      important=False,
   )
 
   # glados-based boards
   _AddGroupConfig(
       'glados', 'glados', (
           'chell',
-          'glados-cheets',
       ),
-      important=False,
   )
 
   # storm-based boards
@@ -2742,7 +2689,6 @@
           'arkham',
           'whirlwind',
       ),
-      important=False,
   )
 
   # kunimitsu-based boards
@@ -2751,7 +2697,6 @@
           'lars',
           'sentry',
       ),
-      important=False,
   )
 
   # Factory and Firmware releases much inherit from these classes.
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 248dd93..0d3b9b4 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -233,7 +233,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": true,
             "chromeos_official": true,
@@ -260,6 +260,7 @@
                 "test",
                 "factory_install"
             ],
+            "important": false,
             "internal": true,
             "manifest": "official.xml",
             "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
@@ -463,7 +464,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": false,
             "chromeos_official": true,
@@ -563,7 +564,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": false,
             "chromeos_official": true,
@@ -618,7 +619,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": false,
             "chromeos_official": true,
@@ -711,7 +712,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": true,
             "chromeos_official": true,
@@ -761,7 +762,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": true,
             "chromeos_official": true,
@@ -973,7 +974,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": true,
             "chromeos_official": true,
@@ -1035,7 +1036,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": true,
             "chromeos_official": true,
@@ -1088,7 +1089,7 @@
             "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
             "binhost_bucket": "gs://chromeos-dev-installer",
             "binhost_key": "RELEASE_BINHOST",
-            "build_timeout": 28200,
+            "build_timeout": 43200,
             "build_type": "canary",
             "chrome_sdk": true,
             "chromeos_official": true,
@@ -1398,7 +1399,6 @@
     },
     "amd64-generic-goofy-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "boards": [
             "amd64-generic-goofy"
         ]
@@ -1939,7 +1939,7 @@
     },
     "auron-b-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "lulu"
         ],
@@ -2111,25 +2111,9 @@
                     "-chrome_internal"
                 ],
                 "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "samus-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "samus-cheets-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: auron, auron_yuna, auron_paine, samus-cheets)",
+        "description": "Full Builds; Group config (boards: auron, auron_yuna, auron_paine)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -2228,7 +2212,7 @@
     },
     "auron-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "auron"
         ],
@@ -2264,21 +2248,9 @@
                 "name": "auron_paine-release",
                 "unittests": null,
                 "vm_tests": []
-            },
-            {
-                "_template": "cheets-release",
-                "boards": [
-                    "samus-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "samus-cheets-release",
-                "unittests": null,
-                "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: auron, auron_yuna, auron_paine, samus-cheets)",
+        "description": "Release Builds (canary) (internal); Group config (boards: auron, auron_yuna, auron_paine)",
         "important": true
     },
     "auron-tot-chrome-pfq-informational": {
@@ -2965,7 +2937,6 @@
     },
     "beaglebone-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "afdo_use": false,
         "boards": [
             "beaglebone"
@@ -3025,7 +2996,6 @@
             "base",
             "test"
         ],
-        "important": true,
         "paygen": false,
         "rootfs_verification": false,
         "signer_tests": false,
@@ -3270,7 +3240,7 @@
     },
     "beltino-a-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "panther"
         ],
@@ -3358,7 +3328,7 @@
     },
     "beltino-b-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "monroe"
         ],
@@ -5409,7 +5379,7 @@
     },
     "daisy-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "daisy"
         ],
@@ -6995,14 +6965,12 @@
     },
     "gizmo-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "afdo_use": false,
         "boards": [
             "gizmo"
         ],
         "chrome_sdk": false,
         "dev_installer_prebuilts": false,
-        "important": true,
         "paygen": false,
         "signer_tests": false,
         "sync_chrome": false,
@@ -7304,25 +7272,9 @@
                     "-chrome_internal"
                 ],
                 "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "glados-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "glados-cheets-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: glados, chell, glados-cheets)",
+        "description": "Full Builds; Group config (boards: glados, chell)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -7421,7 +7373,7 @@
     },
     "glados-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "glados"
         ],
@@ -7445,21 +7397,10 @@
                 "name": "chell-release",
                 "unittests": null,
                 "vm_tests": []
-            },
-            {
-                "_template": "cheets-release",
-                "boards": [
-                    "glados-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "glados-cheets-release",
-                "unittests": null,
-                "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: glados, chell, glados-cheets)"
+        "description": "Release Builds (canary) (internal); Group config (boards: glados, chell)",
+        "important": true
     },
     "glados-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -8119,7 +8060,6 @@
     },
     "guado_moblab-release": {
         "_template": "moblab-release",
-        "active_waterfall": "chromeos",
         "boards": [
             "guado_moblab"
         ],
@@ -8369,7 +8309,6 @@
         ]
     },
     "internal-toolchain-minor": {
-        "active_waterfall": "chromeos",
         "archive_build_debug": true,
         "boards": [
             "x86-alex",
@@ -8464,7 +8403,7 @@
     },
     "ivybridge-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "stout"
         ],
@@ -8754,7 +8693,7 @@
     },
     "jecht-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "jecht"
         ],
@@ -8973,7 +8912,6 @@
     },
     "kayle-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "afdo_use": false,
         "boards": [
             "kayle"
@@ -9521,7 +9459,7 @@
     },
     "kunimitsu-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "kunimitsu"
         ],
@@ -9559,7 +9497,8 @@
                 "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: kunimitsu, lars, sentry)"
+        "description": "Release Builds (canary) (internal); Group config (boards: kunimitsu, lars, sentry)",
+        "important": true
     },
     "kunimitsu-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -9642,7 +9581,6 @@
     },
     "lakitu-incremental": {
         "_template": "incremental",
-        "active_waterfall": "chromeos",
         "boards": [
             "lakitu"
         ],
@@ -9724,7 +9662,7 @@
     },
     "lakitu-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "afdo_use": false,
         "boards": [
             "lakitu"
@@ -9893,7 +9831,6 @@
     },
     "lakitu_mobbuild-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "afdo_use": false,
         "boards": [
             "lakitu_mobbuild"
@@ -9904,7 +9841,6 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "important": true,
         "signer_tests": false,
         "sync_chrome": false,
         "vm_tests": []
@@ -9996,7 +9932,6 @@
     },
     "lakitu_next-incremental": {
         "_template": "incremental",
-        "active_waterfall": "chromeos",
         "boards": [
             "lakitu_next"
         ],
@@ -10033,7 +9968,6 @@
     },
     "lakitu_next-paladin": {
         "_template": "paladin",
-        "active_waterfall": "chromeos",
         "boards": [
             "lakitu_next"
         ],
@@ -10079,7 +10013,6 @@
     },
     "lakitu_next-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "afdo_use": false,
         "boards": [
             "lakitu_next"
@@ -10524,7 +10457,6 @@
     },
     "link-depthcharge-full-firmware": {
         "_template": "depthcharge-full-firmware",
-        "active_waterfall": "chromeos",
         "boards": [
             "link"
         ],
@@ -11043,7 +10975,6 @@
     },
     "mario-incremental": {
         "_template": "incremental",
-        "active_waterfall": "chromeos",
         "boards": [
             "x86-mario"
         ],
@@ -11113,7 +11044,7 @@
     },
     "master-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "afdo_use": false,
         "boards": [],
         "branch_util_test": true,
@@ -12084,7 +12015,7 @@
     },
     "nyan-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "nyan"
         ],
@@ -12594,7 +12525,6 @@
     },
     "nyan_freon-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "boards": [
             "nyan_freon"
         ],
@@ -13005,7 +12935,6 @@
     },
     "oak-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "boards": [
             "oak"
         ],
@@ -13021,7 +12950,6 @@
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: oak)",
-        "important": true,
         "vm_tests": []
     },
     "oak-tot-chrome-pfq-informational": {
@@ -13472,14 +13400,12 @@
     },
     "panther_embedded-minimal-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "afdo_use": false,
         "boards": [
             "panther_embedded"
         ],
         "chrome_sdk": false,
         "dev_installer_prebuilts": false,
-        "important": true,
         "paygen": false,
         "profile": "minimal",
         "signer_tests": false,
@@ -14319,7 +14245,7 @@
     },
     "peach-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "peach_pit"
         ],
@@ -14985,7 +14911,7 @@
     },
     "pineview-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "x86-mario"
         ],
@@ -15498,7 +15424,7 @@
     },
     "rambi-a-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "rambi"
         ],
@@ -15626,7 +15552,7 @@
     },
     "rambi-b-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "glimmer"
         ],
@@ -15754,7 +15680,7 @@
     },
     "rambi-c-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "squawks"
         ],
@@ -15903,7 +15829,7 @@
     },
     "rambi-d-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "banjo"
         ],
@@ -16011,7 +15937,7 @@
     },
     "rambi-e-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "orco"
         ],
@@ -16838,7 +16764,7 @@
     },
     "samus-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "samus"
         ],
@@ -16971,7 +16897,7 @@
     },
     "sandybridge-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "parrot"
         ],
@@ -17598,7 +17524,7 @@
     },
     "slippy-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "peppy"
         ],
@@ -17822,7 +17748,6 @@
     },
     "smaug-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "boards": [
             "smaug"
         ],
@@ -18313,7 +18238,7 @@
     },
     "storm-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "afdo_use": false,
         "boards": [
             "storm"
@@ -18369,6 +18294,7 @@
         "chrome_sdk": false,
         "description": "Release Builds (canary) (internal); Group config (boards: storm, arkham, whirlwind)",
         "dev_installer_prebuilts": false,
+        "important": true,
         "paygen_skip_testing": true,
         "signer_tests": false,
         "sync_chrome": false,
@@ -18582,22 +18508,6 @@
             {
                 "_template": "full",
                 "boards": [
-                    "cyan-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "cyan-cheets-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
                     "wizpig"
                 ],
                 "build_packages_in_background": true,
@@ -18626,9 +18536,25 @@
                     "-chrome_internal"
                 ],
                 "vm_tests": []
+            },
+            {
+                "_template": "full",
+                "boards": [
+                    "edgar"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "edgar-full",
+                "prebuilts": "public",
+                "unittests": null,
+                "useflags": [
+                    "-chrome_internal"
+                ],
+                "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: reks, cyan-cheets, wizpig, terra)",
+        "description": "Full Builds; Group config (boards: reks, wizpig, terra, edgar)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -18636,7 +18562,7 @@
     },
     "strago-b-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "reks"
         ],
@@ -18650,18 +18576,6 @@
                 "name": "reks-release"
             },
             {
-                "_template": "cheets-release",
-                "boards": [
-                    "cyan-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "cyan-cheets-release",
-                "unittests": null,
-                "vm_tests": []
-            },
-            {
                 "_template": "release",
                 "boards": [
                     "wizpig"
@@ -18684,82 +18598,23 @@
                 "name": "terra-release",
                 "unittests": null,
                 "vm_tests": []
+            },
+            {
+                "_template": "release",
+                "boards": [
+                    "edgar"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "edgar-release",
+                "unittests": null,
+                "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: reks, cyan-cheets, wizpig, terra)",
+        "description": "Release Builds (canary) (internal); Group config (boards: reks, wizpig, terra, edgar)",
         "important": true
     },
-    "strago-c-full-group": {
-        "_template": "full",
-        "boards": [
-            "edgar"
-        ],
-        "child_configs": [
-            {
-                "_template": "full",
-                "boards": [
-                    "edgar"
-                ],
-                "grouped": true,
-                "name": "edgar-full",
-                "prebuilts": "public",
-                "useflags": [
-                    "-chrome_internal"
-                ]
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "setzer"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "setzer-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            }
-        ],
-        "description": "Full Builds; Group config (boards: edgar, setzer)",
-        "prebuilts": "public",
-        "useflags": [
-            "-chrome_internal"
-        ]
-    },
-    "strago-c-release-group": {
-        "_template": "release",
-        "active_waterfall": "chromeos",
-        "boards": [
-            "edgar"
-        ],
-        "child_configs": [
-            {
-                "_template": "release",
-                "boards": [
-                    "edgar"
-                ],
-                "grouped": true,
-                "name": "edgar-release"
-            },
-            {
-                "_template": "release",
-                "boards": [
-                    "setzer"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "setzer-release",
-                "unittests": null,
-                "vm_tests": []
-            }
-        ],
-        "description": "Release Builds (canary) (internal); Group config (boards: edgar, setzer)"
-    },
     "strago-chrome-pfq": {
         "_template": "chrome-pfq",
         "boards": [
@@ -19008,7 +18863,7 @@
     },
     "strago-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "strago"
         ],
@@ -20551,33 +20406,17 @@
     "veyron-b-full-group": {
         "_template": "full",
         "boards": [
-            "veyron_gus"
+            "veyron_jaq"
         ],
         "child_configs": [
             {
                 "_template": "full",
                 "boards": [
-                    "veyron_gus"
-                ],
-                "grouped": true,
-                "name": "veyron_gus-full",
-                "prebuilts": "public",
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
                     "veyron_jaq"
                 ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
                 "grouped": true,
                 "name": "veyron_jaq-full",
                 "prebuilts": "public",
-                "unittests": null,
                 "useflags": [
                     "-chrome_internal"
                 ],
@@ -20614,9 +20453,25 @@
                     "-chrome_internal"
                 ],
                 "vm_tests": []
+            },
+            {
+                "_template": "full",
+                "boards": [
+                    "veyron_mickey"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "veyron_mickey-full",
+                "prebuilts": "public",
+                "unittests": null,
+                "useflags": [
+                    "-chrome_internal"
+                ],
+                "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: veyron_gus, veyron_jaq, veyron_minnie, veyron_rialto)",
+        "description": "Full Builds; Group config (boards: veyron_jaq, veyron_minnie, veyron_rialto, veyron_mickey)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -20625,30 +20480,18 @@
     },
     "veyron-b-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
-            "veyron_gus"
+            "veyron_jaq"
         ],
         "child_configs": [
             {
                 "_template": "release",
                 "boards": [
-                    "veyron_gus"
-                ],
-                "grouped": true,
-                "name": "veyron_gus-release",
-                "vm_tests": []
-            },
-            {
-                "_template": "release",
-                "boards": [
                     "veyron_jaq"
                 ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
                 "grouped": true,
                 "name": "veyron_jaq-release",
-                "unittests": null,
                 "vm_tests": []
             },
             {
@@ -20676,98 +20519,6 @@
                 "sync_chrome": false,
                 "unittests": null,
                 "vm_tests": []
-            }
-        ],
-        "description": "Release Builds (canary) (internal); Group config (boards: veyron_gus, veyron_jaq, veyron_minnie, veyron_rialto)",
-        "important": true,
-        "vm_tests": []
-    },
-    "veyron-c-full-group": {
-        "_template": "full",
-        "boards": [
-            "veyron_brain"
-        ],
-        "child_configs": [
-            {
-                "_template": "full",
-                "boards": [
-                    "veyron_brain"
-                ],
-                "grouped": true,
-                "name": "veyron_brain-full",
-                "prebuilts": "public",
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "veyron_danger"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_danger-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "veyron_mickey"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_mickey-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            }
-        ],
-        "description": "Full Builds; Group config (boards: veyron_brain, veyron_danger, veyron_mickey)",
-        "prebuilts": "public",
-        "useflags": [
-            "-chrome_internal"
-        ],
-        "vm_tests": []
-    },
-    "veyron-c-release-group": {
-        "_template": "release",
-        "active_waterfall": "chromeos",
-        "boards": [
-            "veyron_brain"
-        ],
-        "child_configs": [
-            {
-                "_template": "release",
-                "boards": [
-                    "veyron_brain"
-                ],
-                "grouped": true,
-                "name": "veyron_brain-release",
-                "vm_tests": []
-            },
-            {
-                "_template": "release",
-                "boards": [
-                    "veyron_danger"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_danger-release",
-                "unittests": null,
-                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -20782,111 +20533,7 @@
                 "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: veyron_brain, veyron_danger, veyron_mickey)",
-        "important": true,
-        "vm_tests": []
-    },
-    "veyron-d-full-group": {
-        "_template": "full",
-        "boards": [
-            "veyron_shark"
-        ],
-        "child_configs": [
-            {
-                "_template": "full",
-                "boards": [
-                    "veyron_shark"
-                ],
-                "grouped": true,
-                "name": "veyron_shark-full",
-                "prebuilts": "public",
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "veyron_romy"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_romy-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            },
-            {
-                "_template": "full",
-                "boards": [
-                    "veyron_minnie-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_minnie-cheets-full",
-                "prebuilts": "public",
-                "unittests": null,
-                "useflags": [
-                    "-chrome_internal"
-                ],
-                "vm_tests": []
-            }
-        ],
-        "description": "Full Builds; Group config (boards: veyron_shark, veyron_romy, veyron_minnie-cheets)",
-        "prebuilts": "public",
-        "useflags": [
-            "-chrome_internal"
-        ],
-        "vm_tests": []
-    },
-    "veyron-d-release-group": {
-        "_template": "release",
-        "active_waterfall": "chromeos",
-        "boards": [
-            "veyron_shark"
-        ],
-        "child_configs": [
-            {
-                "_template": "release",
-                "boards": [
-                    "veyron_shark"
-                ],
-                "grouped": true,
-                "name": "veyron_shark-release",
-                "vm_tests": []
-            },
-            {
-                "_template": "release",
-                "boards": [
-                    "veyron_romy"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_romy-release",
-                "unittests": null,
-                "vm_tests": []
-            },
-            {
-                "_template": "cheets-release",
-                "boards": [
-                    "veyron_minnie-cheets"
-                ],
-                "build_packages_in_background": true,
-                "chrome_sdk_build_chrome": false,
-                "grouped": true,
-                "name": "veyron_minnie-cheets-release",
-                "unittests": null,
-                "vm_tests": []
-            }
-        ],
-        "description": "Release Builds (canary) (internal); Group config (boards: veyron_shark, veyron_romy, veyron_minnie-cheets)",
+        "description": "Release Builds (canary) (internal); Group config (boards: veyron_jaq, veyron_minnie, veyron_rialto, veyron_mickey)",
         "important": true,
         "vm_tests": []
     },
@@ -20967,7 +20614,7 @@
     },
     "veyron-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
+        "active_waterfall": "chromeos_release",
         "boards": [
             "veyron_pinky"
         ],
@@ -22792,7 +22439,6 @@
     },
     "veyron_rialto-paladin": {
         "_template": "paladin",
-        "active_waterfall": "chromeos",
         "boards": [
             "veyron_rialto"
         ],