CrOS: Switch tryserver over to recipes, Gitiles.

scripts/master/factory/chromeos_factory.py

 # Copyright (c) 2012 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.
 
 """Set of utilities to build the chromium master."""
 
 import os
 
 from buildbot.steps import shell
 from buildbot.interfaces import IRenderable
@@ skipping 12 matching lines @@
 
   This class is a callable wrapper to annotator_factory.AnnotatorFactory's
   BaseFactory method.
 
   This class painfully avoids subclassing annotator_factory.AnnotatorFactory in
   order to preserve its status as a terminal factory.
   """
 
   # The default Chromite recipe timeout.
   _CHROMITE_TIMEOUT = 9000
+  # The default maximum build time.
+  _DEFAULT_MAX_TIME = 16 * 60 * 60
 
   @classmethod
   def __call__(cls, factory_obj, recipe, *args, **kwargs):
     """Returns a factory object to use for Chromite annotator recipes.
 
     Args:
       factory_obj (annotator_factory.AnnotatorFactory) The annotator factory.
       recipe: The name of the recipe to invoke.
       debug (bool): If True, override default debug logic.
       args, kwargs: Positional / keyword arguments (see
           annotator_factory.AnnotatorFactory.BaseFactory).
     """
     kwargs.setdefault('timeout', cls._CHROMITE_TIMEOUT)
 
     factory_properties = kwargs.setdefault('factory_properties', {})
     # Set the 'cbb_debug' property if we're not running in a production master.
     if kwargs.pop('debug', False):
       factory_properties['cbb_debug'] = True
+    kwargs.setdefault('max_time', cls._DEFAULT_MAX_TIME)
     return factory_obj.BaseFactory(recipe, *args, **kwargs)
 
-
-# Callable instance of '_ChromiteFactoryFunc'.
+# Callable instance of '_ChromiteRecipeFactoryFunc'.
 ChromiteRecipeFactory = _ChromiteRecipeFactoryFunc()
 
 
 class ChromiteFactory(object):
   """
   Create a build factory that runs a chromite script.
 
   This is designed mainly to utilize build scripts directly hosted in
   chromite.git.
 
@@ skipping 147 matching lines @@
 class CbuildbotFactory(ChromiteFactory):
   """
   Create a build factory that runs the cbuildbot script.
 
   Attributes:
       params: space-delimited string of parameters to pass to the cbuildbot
           command, or IRenderable.
       script: name of the cbuildbot command.  Default cbuildbot.
       buildroot: buildroot to set. Default is /b/cbuild.
       dry_run: Don't push anything as we're running a test run.
-      trybot: Whether this is creating builders for the trybot waterfall.
       chrome_root: The place to put or use the chrome source.
       pass_revision: to pass the chrome revision desired into the build.
       legacy_chromite: If set, ask chromite to use an older cbuildbot directory.
       clobber: If True, force a clobber.
       *: anything else is passed to the base Chromite class.
   """
 
   def __init__(self,
                params,
                script='cbuildbot',
                buildroot='/b/cbuild',
                dry_run=False,
-               trybot=False,
                chrome_root=None,
                pass_revision=None,
                legacy_chromite=False,
                clobber=False,
                **kwargs):
     super(CbuildbotFactory, self).__init__(None, None,
         use_chromeos_factory=not pass_revision, **kwargs)
 
     self.script = script
-    self.trybot = trybot
     self.chrome_root = chrome_root
     self.pass_revision = pass_revision
     self.legacy_chromite = legacy_chromite
     self.buildroot = buildroot
     self.dry_run = dry_run
     self.clobber = clobber
     assert params
     self.add_cbuildbot_step(params)
 
 
   def add_cbuildbot_step(self, params):
     self.add_chromite_step(self.script, params, self.compute_buildbot_params(),
                            legacy=self.legacy_chromite)
 
 
   def compute_buildbot_params(self):
-    cmd = [WithProperties('--buildnumber=%(buildnumber)s'),
-           ConditionalProperty(
-               'buildroot',
-               WithProperties('--buildroot=%(buildroot)s'),
-               '--buildroot=%s' % self.buildroot)
-          ]
+    cmd = [
+        WithProperties('--buildnumber=%(buildnumber)s'),
+       ConditionalProperty(
+           'buildroot',
+           WithProperties('--buildroot=%(buildroot)s'),
+           '--buildroot=%s' % self.buildroot),
+       '--buildbot',
+    ]
 
     # Add '--master-build-id' flag when build ID property is present
     cmd.append(
         ConditionalProperty(
             'master_build_id',
             WithProperties('--master-build-id=%(master_build_id)s'),
             [], # Will be flattened to nothing.
         )
     )
 
-    if self.trybot:
-      cmd.append(Property('extra_args'))
-    else:
-      cmd += ['--buildbot']
-
     if self.dry_run:
       cmd += ['--debug']
 
     if self.chrome_root:
       cmd.append('--chrome_root=%s' % self.chrome_root)
 
     if self.pass_revision:
       cmd.append(WithProperties('--chrome_version=%(revision)s'))
 
     # Clobber if forced or if the 'clobber' property is set.
@@ skipping 54 matching lines @@
     cmd.append(WithProperties('%s' + self.buildroot, 'clobber:+--clobber '))
 
     self.f_cbuild.addStep(chromium_step.AnnotatedCommand,
                           command=cmd,
                           timeout=self.timeout,
                           name=script,
                           description=script,
                           usePTY=False,
                           env={'PYTHONPATH':'.'},
                           ** self.step_args)