recipe_modules/chromite: Use "build_type".

scripts/slave/recipes/cros/cbuildbot.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'chromite',
   'gitiles',
   'recipe_engine/properties',
 ]
 
 
 # Map master name to 'chromite' configuration name.
 _MASTER_CONFIG_MAP = {
   'chromiumos': {
     'master_config': 'master_chromiumos',
-    'variants': {
-      'paladin': ['chromiumos_paladin'],
+    'build_type_configs': {
+      'paladin': 'chromiumos_paladin',
     },
   },
   'chromiumos.chromium': {
     'master_config': 'master_chromiumos_chromium',
   },
 
-  # Fake waterfall for Coverage
+  # Fake master name for Coverage.
   'chromiumos.coverage': {
-    'master_config': 'master_chromiumos',
+    'master_config': 'chromiumos_coverage',
+    'build_type_configs': {
+      'foo': 'bar',
+    },
+    # TODO(dnj): Remove this entry once we deprecate variants.
     'variants': {
-      'test': ['chromiumos_coverage_test'],
+      'coverage': ['coverage_variant'],
     },
   },
 }
 
 def RunSteps(api):
   # Load the appropriate configuration based on the master.
   api.chromite.configure(
       api.properties,
       _MASTER_CONFIG_MAP)
 
   # Run 'cbuildbot' common recipe.
   api.chromite.run_cbuildbot()
 
+
 def GenTests(api):
   #
   # master.chromiumos.chromium
   #
 
   # Test a standard CrOS build triggered by a Chromium commit.
   yield (
       api.test('chromiumos_chromium_builder')
       + api.properties(
           mastername='chromiumos.chromium',
@@ skipping 17 matching lines @@
       + api.properties(
           mastername='chromiumos',
           buildername='Test',
           slavename='test',
           buildnumber='12345',
           repository='https://chromium.googlesource.com/chromiumos/'
                      'manifest-versions',
           branch='master',
           revision=api.gitiles.make_hash('test'),
           cbb_config='x86-generic-paladin',
-          cbb_variant='paladin',
       )
       + api.step_data(
           'Fetch manifest config',
           api.gitiles.make_commit_test_data(
               'test',
               '\n'.join([
                   'Commit message!',
                   'Automatic: Start master-paladin master 6952.0.0-rc4',
                   'CrOS-Build-Id: 1337',
               ]),
           ),
       )
+      + api.chromite.add_chromite_config(
+          'x86-generic-paladin',
+          build_type='paladin',
+      )
   )
 
   # Test a ChromiumOS Paladin build whose manifest is not parsable.
   yield (
       api.test('chromiumos_paladin_manifest_failure')
       + api.properties(
           mastername='chromiumos',
           buildername='Test',
           slavename='test',
           buildnumber='12345',
           repository='https://chromium.googlesource.com/chromiumos/'
                      'manifest-versions',
           branch='master',
           revision=api.gitiles.make_hash('test'),
           cbb_config='x86-generic-paladin',
-          cbb_variant='paladin',
       )
       + api.step_data(
           'Fetch manifest config',
           api.gitiles.make_commit_test_data(
               'test',
               None
           )
       )
+      + api.chromite.add_chromite_config(
+          'x86-generic-paladin',
+          build_type='paladin',
+      )
   )
 
   #
   # [Coverage]
   #
 
   # Coverage builders for a bunch of options used in other repositories.
   yield (
       api.test('chromiumos_coverage')
       + api.properties(
           mastername='chromiumos.coverage',
           buildername='Test',
           slavename='test',
           buildnumber=0,
           clobber=None,
           repository='https://chromium.googlesource.com/chromiumos/'
                      'chromite.git',
           revision='fdea0dde664e229976ddb2224328da152fba15b1',
           branch='master',
           cbb_config='x86-generic-full',
-          cbb_branch='factory-1412.B',
-          cbb_variant='test',
+          cbb_branch='firmware-uboot_v2-1299.B',
+          config_repo='https://fake.googlesource.com/myconfig/repo.git',
+          cbb_debug=True,
+          cbb_disable_branch=True,
+      )
+  )
+
+  # Coverage builders for a bunch of options used in other repositories.
+  # This one uses a variant system.
+  #
+  # TODO(dnj): Remove this once variant support is deleted.
+  yield (
+      api.test('chromiumos_coverage_variant')
+      + api.properties(
+          mastername='chromiumos.coverage',
+          buildername='Test',
+          slavename='test',
+          buildnumber=0,
+          clobber=None,
+          repository='https://chromium.googlesource.com/chromiumos/'
+                     'chromite.git',
+          revision='fdea0dde664e229976ddb2224328da152fba15b1',
+          branch='master',
+          cbb_variant='coverage',
+          cbb_config='x86-generic-full',
+          cbb_branch='firmware-uboot_v2-1299.B',
           cbb_debug=True,
           cbb_disable_branch=True,
           config_repo='https://fake.googlesource.com/myconfig/repo.git',
       )
   )