CrOS: Switch tryserver over to recipes, Gitiles.

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 65 matching lines @@
           break
     else:
       raise self.m.step.StepFailure('Could not find tryjob description.')
 
     # Load the tryjob description file.
     desc_json = self.m.gitiles.download_file(
         repository, desc_path, branch=revision,
         step_name=str('Fetch tryjob descriptor (%s)' % (desc_path,)),
         attempts=self._GITILES_ATTEMPTS)
     result = self.m.step.active_result
+    result.presentation.logs['tryjob.json'] = [desc_json]
 
     # Parse the commit description from the file (JSON).
     desc = self.m.json.loads(desc_json)
-    result.presentation.step_text += '<br/>'.join(
-        '%s: %s' % (k, cgi.escape(str(v)))
-        for k, v in desc.iteritems())
     return desc.get('extra_args', ())
 
   def load_manifest_config(self, repository, revision):
     """Loads manifest-specified parameters from the manifest commit.
 
     This method parses the commit log for the following information:
     - The branch to build (From the "Automatic": tag).
     - The build ID (from the CrOS-Build-Id: tag).
 
     Args:
@@ skipping 131 matching lines @@
     # Apply any variant configurations.
     if variant:
       for config_name in config_map.get('variants', {}).get(variant, ()):
         self.apply_config(config_name)
 
 
     # If a config repo was specified, use it.
     if 'config_repo' in properties:
       self.c.cbb.config_repo = self.m.properties['config_repo']
 
-  def run_cbuildbot(self, tryjob=False):
+  def run_cbuildbot(self, args=[]):
     """Runs a 'cbuildbot' checkout-and-build workflow.
 
     This workflow uses the registered configuration dictionary to make master-
     and builder-specific changes to the standard workflow.
 
     The specific workflow paths that are taken are also influenced by several
     build properties.
 
     TODO(dnj): When CrOS migrates away from BuildBot, replace property
         inferences with command-line parameters.
 
     This workflow:
     - Checks out the specified 'cbuildbot' repository.
     - Pulls information based on the configured change's repository/revision
       to pass to 'cbuildbot'.
     - Executes the 'cbuildbot' command.
 
     Args:
-      tryjob (bool): If True, load a tryjob description from the source
-          repository and augment the cbuildbot command-line with it.
+      args (list): If True, use this argument list as the base instead of the
+          default, which is '--buildbot'.
     Returns: (Step) the 'cbuildbot' execution step.
     """
     # Assert correct configuration.
     assert self.c.cbb.config, 'An empty configuration was specified.'
     assert self.c.cbb.builddir, 'A build directory name must be specified.'
 
     # Load properties from the commit being processed. This requires both a
     # repository and revision to proceed.
     repository = self.m.properties.get('repository')
     revision = self.m.properties.get('revision')
-    tryjob_args = []
     if repository and revision:
-      if tryjob:
-        assert self.check_repository('tryjob', repository), (
-            "Refusing to query unknown tryjob repository: %s" % (repository,))
-        # If we are a tryjob, add parameters specified in the description.
-        tryjob_args = self.load_try_job(repository, revision)
-
       # Pull more information from the commit if it came from certain known
       # repositories.
       if (self.c.use_chrome_version and
           self.check_repository('chromium', repository)):
         # If our change comes from a Chromium repository, add the
         # '--chrome_version' flag.
         self.c.cbb.chrome_version = self.m.properties['revision']
       if (self.c.read_cros_manifest and
           self.check_repository('cros_manifest', repository)):
         # This change comes from a manifest repository. Load configuration
         # parameters from the manifest command.
         self.load_manifest_config(repository, revision)
 
     buildroot = self.m.path['root'].join('cbuild', self.c.cbb.builddir)
     cbb_args = [
         '--buildroot', buildroot,
     ]
-    if not tryjob:
+    if not args:
       cbb_args.append('--buildbot')
     if self.c.chromite_branch and not self.c.cbb.disable_bootstrap:
       cbb_args.extend(['--branch', self.c.chromite_branch])
     if self.c.cbb.build_number is not None:
       cbb_args.extend(['--buildnumber', self.c.cbb.build_number])
     if self.c.cbb.chrome_rev:
       cbb_args.extend(['--chrome_rev', self.c.cbb.chrome_rev])
     if self.c.cbb.debug:
       cbb_args.extend(['--debug'])
     if self.c.cbb.clobber:
       cbb_args.extend(['--clobber'])
     if self.c.cbb.chrome_version:
       cbb_args.extend(['--chrome_version', self.c.cbb.chrome_version])
     if self.c.cbb.config_repo:
       cbb_args.extend(['--config_repo', self.c.cbb.config_repo])
 
     # Set the build ID, if specified.
     if self.c.cbb.build_id:
       cbb_args.extend(['--master-build-id', self.c.cbb.build_id])
 
-    # Add tryjob args, if there are any.
-    cbb_args.extend(tryjob_args)
+    # Add custom args, if there are any.
+    cbb_args.extend(args)
 
     # Checkout Chromite.
     self.m.bot_update.ensure_checkout(
         gclient_config=self.gclient_config(),
         update_presentation=False,
         force=True)
     if self.c.chromite_branch and self.c.cbb.disable_bootstrap:
       # Chromite auto-detects which branch to build for based on its current
       # checkout. "bot_update" checks out remote branches, but Chromite requires
       # a local branch.
       #
       # Normally we'd bootstrap, but if we're disabling bootstrapping, we have
       # to checkout the local branch to let Chromite know which branch to build.
       self.m.git('checkout', self.c.chromite_branch,
           name=str('checkout chromite branch [%s]' % (self.c.chromite_branch)))
 
     # Run cbuildbot.
     return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)),
                           self.c.cbb.config,
                           args=cbb_args,
                           chromite_path=self.m.path['checkout'],
                           cwd=self.m.path['slave_root'])