Base flags on bootstrapped Chromite branch.

scripts/slave/recipes/cros/cbuildbot_tryjob.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 base64
 import json
 import zlib
 
 
 DEPS = [
@@ skipping 53 matching lines @@
   # The 'cbuildbot' config name to build is the name of the builder.
   #
   # TODO(dnj): After we fully switch to BuildBucket scheduling, load the config
   #            name from the BuildBucket job instead of `cbb_config` build
   #            property. We can't do this yet b/c the job description can
   #            specify multiple configs in one tryjob, so there's no way for us
   #            to know which one we are.
   cbb_config_name = api.properties.get('cbb_config')
   assert cbb_config_name, "No configuration name specified."
 
+  # Get parameters specified in the tryjob description.
+  tryjob_args = api.properties.get('cbb_extra_args', [])
+  if tryjob_args:
+    if tryjob_args.startswith('z:'):
+      tryjob_args = zlib.decompress(base64.b64decode(tryjob_args[2:]))
+    tryjob_args = api.json.loads(tryjob_args)
+
   # Apply our generic configuration.
   api.chromite.configure(
       api.properties,
-      _MASTER_CONFIG_MAP)
+      _MASTER_CONFIG_MAP,
+      CBB_EXTRA_ARGS=tryjob_args)
   api.chromite.c.cbb.config = cbb_config_name
 
   # Load the Chromite configuration for our target.
   api.chromite.checkout_chromite()
   cbb_config = api.chromite.load_config(cbb_config_name)
 
-  # Add parameters specified in the tryjob description.
-  tryjob_args = api.properties.get('cbb_extra_args', [])
-  if tryjob_args:
-    if tryjob_args.startswith('z:'):
-      tryjob_args = zlib.decompress(base64.b64decode(tryjob_args[2:]))
-    tryjob_args = api.json.loads(tryjob_args)
-
   # Determine our build directory name based on whether this build is internal
   # or external.
   #
   # We have two checkout options: internal and external. By default we will
   # infer which to use based on the Chromite config. However, the pinned
   # Chromite config may not be up to date. If the value cannot be inferred, we
   # will "quarantine" the build by running it in a separate "etc_master"
   # build root and instructing `cbuildbot` to clobber beforehand.
   #
   # TODO: As the configuration owner, Chromite should be the entity to make the
@@ skipping 55 matching lines @@
           revision=api.gitiles.make_hash('test'),
           cbb_config='x86-generic-full',
           cbb_branch='release-R55-9999.B',
           cbb_extra_args='["--timeout", "14400", "--remote-trybot",'
                          '"--remote-version=4"]',
       )
       + api.chromite.seed_chromite_config(_CHROMITE_CONFIG)
   )
 
   yield (
+      api.test('release_branch_one_param')
+      + api.properties(
+          mastername='chromiumos.tryserver',
+          buildername='paladin',
+          slavename='test',
+          repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
+          revision=api.gitiles.make_hash('test'),
+          cbb_config='x86-generic-full',
+          cbb_branch='master',
+          cbb_extra_args=json.dumps([
+              '--timeout', '14400', '--remote-trybot',
+              '--remote-version=4', '--branch=release-R00-0000.B']),
+      )
+      + api.chromite.seed_chromite_config(_CHROMITE_CONFIG)
+  )
+
+  yield (
+      api.test('release_branch_two_params')
+      + api.properties(
+          mastername='chromiumos.tryserver',
+          buildername='paladin',
+          slavename='test',
+          repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
+          revision=api.gitiles.make_hash('test'),
+          cbb_config='x86-generic-full',
+          cbb_branch='master',
+          cbb_extra_args=json.dumps([
+              '--timeout', '14400', '--remote-trybot',
+              '--remote-version=4', '--branch', 'release-R00-0000.B']),
+      )
+      + api.chromite.seed_chromite_config(_CHROMITE_CONFIG)
+  )
+
+  yield (
       api.test('pre_git_cache_release')
       + api.properties(
           mastername='chromiumos.tryserver',
           buildername='paladin',
           slavename='test',
           repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
           revision=api.gitiles.make_hash('test'),
           cbb_config='x86-generic-full',
           cbb_branch='release-R54-8743.B',
           cbb_extra_args='["--timeout", "14400", "--remote-trybot",'
@@ skipping 44 matching lines @@
           slavename='test',
           repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
           revision=api.gitiles.make_hash('test'),
           cbb_config='binhost-pre-cq',
           cbb_extra_args='["--timeout", "14400", "--remote-trybot",'
                          '"--remote-version=4"]',
           buildbucket=json.dumps({'build': {'id':'12345'}})
       )
       + api.chromite.seed_chromite_config(_CHROMITE_CONFIG)
   )