Base flags on bootstrapped Chromite branch.

scripts/slave/recipe_modules/chromite/config.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 os
 import re
 
 from recipe_engine.config import config_item_context, ConfigGroup
-from recipe_engine.config import Dict, Single, Set
+from recipe_engine.config import Dict, Single, List, Set
 
 
 # Regular expression to match branch versions.
 #
 # Examples:
 # - release-R54-8743.B
 # - stabilize-8743.B
 # - factory-gale-8743.19.B
 # - stabilize-8743.25.B
 _VERSION_RE = re.compile(r'^.*-(\d+)\.(\d+\.)?B$')
 
 
 def BaseConfig(CBB_CONFIG=None, CBB_BRANCH=None, CBB_BUILD_NUMBER=None,
                CBB_DEBUG=False, CBB_CLOBBER=False, CBB_BUILDBUCKET_ID=None,
-               CBB_MASTER_BUILD_ID=None, **_kwargs):
-  return ConfigGroup(
+               CBB_MASTER_BUILD_ID=None, CBB_EXTRA_ARGS=None, **_kwargs):
+  cgrp = ConfigGroup(
     # Base mapping of repository key to repository name.
     repositories = Dict(value_type=Set(basestring)),
 
     # Checkout Chromite at this branch. "origin/" will be prepended.
     chromite_branch = Single(basestring, empty_val=CBB_BRANCH or 'master'),
 
     # Should the Chrome version be supplied to cbuildbot?
     use_chrome_version = Single(bool),
 
     # Should the CrOS manifest commit message be parsed and added to 'cbuildbot'
@@ skipping 46 matching lines @@
       disable_bootstrap = Single(bool),
 
       # Whether this Chromite version supports warm cache.
       # https://chromium-review.googlesource.com/#/c/348011
       supports_repo_cache = Single(bool),
 
       # If set, supply the "--git-cache-dir" option with this value.
       git_cache_dir = Single(basestring),
 
       # If supplied, forward to cbuildbot as '--buildbucket-id'
-      buildbucket_id = Single(basestring, empty_val=CBB_BUILDBUCKET_ID)
+      buildbucket_id = Single(basestring, empty_val=CBB_BUILDBUCKET_ID),
+
+      # Extra arguments passed to cbuildbot.
+      extra_args = List(basestring),
     ),
 
     # A list of branches whose Chromite version is "old". Old Chromite
     # buildbot commands reside in the "buildbot" subdirectory of the Chromite
     # repository instead of the "bin".
     old_chromite_branches = Set(basestring),
 
     # A list of branches whose builders should not use a shared buildroot.
     non_shared_root_branches = Set(basestring),
 
     # A list of branches whose builders checkout Chrome from SVN instead of Git.
     chrome_svn_branches = Set(basestring),
 
     # If "chromite_branch" includes a branch version, this will be set to the
     # version value. Otherwise, this will be None.
     #
     # Set in "base".
     branch_version = Single(int),
 
     # Directory where a warm repo cache is stored. If set, and if the current
     # build supports a warm cache, this will be used to bootstrap the Chromite
     # checkout.
     repo_cache_dir = Single(basestring),
 
     # The branch version where the "--git-cache" flag was introduced.
     # Set to a ToT build after R54 branch, "release-R54-8743.B".
     git_cache_min_branch_version = Single(int, empty_val=8829),
   )
 
+  if CBB_EXTRA_ARGS:
+    cgrp.cbb.extra_args = CBB_EXTRA_ARGS

[nxia1, 2016/09/28 21:45:31]

any reason for not combining this with line 95? we can pass in CBB_EXTRA_ARGS=[]
as the default value and combine them?

[dnj, 2016/09/28 22:52:16]

List doesn't have a default value.

+  return cgrp
+
+
 config_ctx = config_item_context(BaseConfig)
 
 
 @config_ctx()
 def base(c):
   c.repositories['tryjob'] = []
   c.repositories['chromium'] = []
   c.repositories['cros_manifest'] = []
   c.repo_cache_dir = '/var/cache/chrome-infra/ccompute-setup/cros-internal'
 
   c.old_chromite_branches.update((
     'firmware-uboot_v2-1299.B',
      # TODO(dnj): Remove this once internal expectations are updated.
     'factory-1412.B',
   ))
   c.non_shared_root_branches.update(c.old_chromite_branches)
   c.non_shared_root_branches.update((
     'factory-2305.B',
   ))
   c.chrome_svn_branches.update((
      # TODO(dnj): Remove this once internal expectations are updated.
     'factory-4455.B',
      # TODO(dnj): Remove this once internal expectations are updated.
     'factory-zako-5220.B',
 
     'factory-rambi-5517.B',
     'factory-nyan-5772.B',
   ))
 
+  # Determine if we're manually specifying the tryjob branch in the extra
+  # args. If we are, use that as the branch version.
+  chromite_branch = c.chromite_branch
+  try:
+    branch_flag_idx = list(c.cbb.extra_args).index('--branch') + 1

[nxia1, 2016/09/28 21:45:31]

what happens when people pass in '--branch=master'? is it converted properly to
'--branch master' somewhere? 

[dnj, 2016/09/28 22:52:16]

Ugh is that something people do? I'll fix.

+    if branch_flag_idx < len(c.cbb.extra_args):
+      chromite_branch = c.cbb.extra_args[branch_flag_idx]

[nxia1, 2016/09/28 22:00:03]

and I'm confused why we can't overwrite c.chromite_branch by the chromite_branch
got from the extra_args.

[dnj, 2016/09/28 22:52:16]

c.chrome_branch controls which branch of Chromite is checked out. If a user
specifies "master" but tells it to use a separate branch via "extra_args", I
don't want the recipe to preempt them. There are use cases where this might be
desired.

If a user wants to not bootstrap, they should just specify "cbb_branch" instead
of using extra_args.

[nxia1, 2016/09/29 00:36:44]

Look I didn't find the cbb_branch settings in tryserver and chromiumOS. There's
cbb_branch settings in chromeos*. is that why we didn't get the right branch
version so always passed in --git-cache-dir?

[nxia1, 2016/09/29 00:37:52]

Look -> Looks like :)

+  except ValueError:
+    pass
+
   # Resolve branch version, if available.
   assert c.chromite_branch, "A Chromite branch must be configured."
-  version = _VERSION_RE.match(c.chromite_branch)
+  version = _VERSION_RE.match(chromite_branch)
   if version:
     c.branch_version = int(version.group(1))
 
   # If running on a testing slave, enable "--debug" so Chromite doesn't cause
   # actual production effects.
   if 'TESTING_MASTER_HOST' in os.environ:  # pragma: no cover
     c.cbb.debug = True
 
 
 @config_ctx(includes=['base'])
@@ skipping 43 matching lines @@
 def chromiumos_coverage(c):
   c.use_chrome_version = True
   c.read_cros_manifest = True
   c.cbb.chrome_rev = 'stable'
   c.cbb.config_repo = 'https://example.com/repo.git'
 
 # TODO(dnj): Remove this config once variant support is removed.
 @config_ctx()
 def coverage_variant(c):
   c.cbb.chrome_rev = 'canary'