Base flags on bootstrapped Chromite branch.

scripts/slave/recipe_modules/chromite/api.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.
 
 import cgi
 import re
 
 from recipe_engine import recipe_api
 
 
@@ skipping 241 matching lines @@
     self.cros_sdk('setup board',
                   ['./setup_board', '--board', board],
                   args, **kwargs)
 
   def build_packages(self, board, args=None, **kwargs):
     """Run the build_packages script inside the chroot."""
     self.cros_sdk('build packages',
                   ['./build_packages', '--board', board],
                   args, **kwargs)
 
-  def configure(self, properties, config_map):
+  def configure(self, properties, config_map, **KWARGS):
     """Loads configuration from build properties into this recipe config.
 
     Args:
       properties (Properties): The build properties object.
       config_map (dict): The configuration map to use.
+      KWARGS: Additional keyword arguments to forward to the configuration.
     """
     master = properties['mastername']
     variant = properties.get('cbb_variant')
 
     # Set the master's base configuration.
     config_map = config_map.get(master, {})
     master_config = config_map.get('master_config')
     assert master_config, (
         "No 'master_config' configuration for '%s'" % (master,))
-    self.set_config(master_config)
+    self.set_config(master_config, **KWARGS)
 
     # If we have any specialized build type configurations for this master,
     # load them.
     self.c.build_type_configs = config_map.get('build_type_configs', {})
 
     # Apply any variant configurations.
     # TODO(dnj): Deprecate variants in favor of build types once all recipes
     # using them have moved off of them.
     if variant:
       for config_name in config_map.get('variants', {}).get(variant, ()):
         self.apply_config(config_name)
 
 
-  def run_cbuildbot(self, args=[]):
+  def run_cbuildbot(self):
     """Performs a Chromite repository checkout, then runs cbuildbot.
-
-    Args:
-      args (list): Additional arguments to pass to `cbuildbot` invocation.
     """
     self.checkout_chromite()
-    self.run(args=args)
+    self.run()
 
   def checkout_chromite(self):
     """Checks out the configured Chromite branch.
     """
     self.m.bot_update.ensure_checkout(
         gclient_config=self.gclient_config(),
         update_presentation=False)
 
     if self.c.chromite_branch and self.c.cbb.disable_bootstrap:
       # Chromite auto-detects which branch to build for based on its current
@@ skipping 115 matching lines @@
     if self.c.cbb.git_cache_dir:
       cbb_args.extend(['--git-cache-dir', self.c.cbb.git_cache_dir])
     elif self.c.repo_cache_dir and self.c.cbb.supports_repo_cache:
       cbb_args.extend(['--repo-cache', self.c.repo_cache_dir])
 
     # Set the build ID, if specified.
     if self.c.cbb.build_id:
       cbb_args.extend(['--master-build-id', self.c.cbb.build_id])
 
     # Add custom args, if there are any.
-    cbb_args.extend(args)
+    cbb_args.extend(self.c.cbb.extra_args)
 
     # Run cbuildbot.
     return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)),
                           self.c.cbb.config,
                           args=cbb_args,
                           cwd=self.m.path['slave_build'])