Base flags on bootstrapped Chromite branch.

scripts/slave/recipes/cros/cbuildbot_tryjob.py

Index: scripts/slave/recipes/cros/cbuildbot_tryjob.py
diff --git a/scripts/slave/recipes/cros/cbuildbot_tryjob.py b/scripts/slave/recipes/cros/cbuildbot_tryjob.py
index 1c6e58f14e3a419fd843e7ea0f1640115073a7ee..48370f2dbbf48bd16b6aafcaaefb76a937823c85 100644
--- a/scripts/slave/recipes/cros/cbuildbot_tryjob.py
+++ b/scripts/slave/recipes/cros/cbuildbot_tryjob.py
@@ -71,23 +71,24 @@ def RunSteps(api):
   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.
   #
@@ -163,6 +164,40 @@ def GenTests(api):
   )
 
   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',