Add arm/tegra2 CQ builders and major cleanup of dead code in chromeos_factory.

scripts/master/factory/chromeos_factory.py

Index: scripts/master/factory/chromeos_factory.py
diff --git a/scripts/master/factory/chromeos_factory.py b/scripts/master/factory/chromeos_factory.py
index d898bf276f2b54061d74dcd59029003227eb622c..b71d17390b60ea0d92d877c8fa0b11493ad2d5c6 100644
--- a/scripts/master/factory/chromeos_factory.py
+++ b/scripts/master/factory/chromeos_factory.py
@@ -5,12 +5,10 @@
 """Set of utilities to build the chromium master."""
 
 import os
-import re
 
 from buildbot.steps import trigger, shell
 from buildbot.process.properties import WithProperties
 
-from master import chromeos_revision_source
 from master import chromium_step
 from master.factory import build_factory
 from master.factory import chromeos_build_factory
@@ -23,22 +21,17 @@ class CbuildbotFactory(object):
   chromite.git.
 
   Attributes:
-      type: The type of cbuildbot setup to produce. If none is specified you
-          just get the boiler plate code in your factory and you can add
-          whatever steps you want to that factory.
-      board: What board to build (x86-generic x86-agz etc).
       buildroot: --buildroot to pass to cbuild.
-      triagelog: Path to a log file to run triagelog, if it is not defined
-          triagelog will not run.
-      variant: board variant to pass on to cbuild build type
       params: string of parameters to pass to the cbuildbot type
       timeout: Timeout in seconds for the main command
           (i.e. the type command). Default 9000 seconds.
       crostools_repo: git repo for crostools toolset.
       chromite_repo: git repo for chromite toolset.
+      trigger_name: Name of the trigger to fire after starting.
       dry_run: Means cbuildbot --debug, or don't push anything (cbuildbot only)
       factory: a factory with pre-existing steps to extend rather than start
           fresh.  Allows composing.
+      pass_revision: to pass the chrome revision desired into the build.
       chromite_patch: a url and ref pair (dict) to patch the checked out
           chromite. Fits well with a single change from a codereview, to use
           on one or more builders for realistic testing, or experiments.
@@ -47,17 +40,13 @@ class CbuildbotFactory(object):
   _default_crostools = 'ssh://gerrit-int.chromium.org:29419/chromeos/crostools'
   _default_chromite = _default_git_base + '/chromite.git'
 
-  DEFAULT_CBUILDBOT_TYPE = 'cbuildbot'
-  CHROME_CBUILDBOT_TYPE = 'cbuildbot_chrome'
-
-  # Redefining built-in 'type'
-  # pylint: disable=W0622
-  def __init__(self, type=DEFAULT_CBUILDBOT_TYPE, board='x86-generic',
-               buildroot='/b/cbuild', triagelog=None, params='', timeout=9000,
-               variant=None, is_master=False, branch='master', old_style=False,
+  def __init__(self,

[scottz, 2011/11/23 01:50:16]

Nit: generally you either put as many arguments are possible on each line or you
have one by one. here you have a mix. Pick one please. 

+               buildroot='/b/cbuild', params='', timeout=9000,

[Peter Mayo, 2011/11/23 14:28:10]

suggest: params='' is a default that doesn't work - we generate a cbuildbot
command that will just fail.  Given that you're juggling all of the parameters
here, could you change the order and make it mandatory?

+               trigger_name=None, branch='master',
                crostools_repo=_default_crostools,
                chromite_repo=_default_chromite,
                dry_run=False, chrome_root=None, factory=None,
+               pass_revision=False,
                slave_manager=True, chromite_patch=None, trybot=False):
     self.buildroot = buildroot
     self.crostools_repo = crostools_repo
@@ -65,12 +54,10 @@ class CbuildbotFactory(object):
     self.chromite_patch = chromite_patch
     if chromite_patch:
       assert ('url' in chromite_patch and 'ref' in chromite_patch)
+
     self.timeout = timeout
-    self.variant = variant
-    self.board = board
     self.branch = branch
-    self.type = type
-    self.is_master = is_master
+    self.trigger_name = trigger_name
     self.dry_run = dry_run
     self.chrome_root = chrome_root
     self.slave_manager = slave_manager
@@ -78,65 +65,16 @@ class CbuildbotFactory(object):
 
     if factory:
       self.f_cbuild = factory
+    elif pass_revision:
+      self.f_cbuild = build_factory.BuildFactory()
     else:
       self.f_cbuild = chromeos_build_factory.BuildFactory()
-    self.add_boiler_plate_steps()
-
-    if type == 'cbuildbot':
-      description_suffix = ''
-      if self.is_master:
-        description_suffix = 'master'
-
-      self.cbuildbot_type(params, description_suffix=description_suffix)
-    elif type == 'cbuild':
-      self.cbuild_type(params)
-    elif type == 'oneoff':
-      self.oneoff_type()
 
-    if triagelog:
-      self.add_triagelog_step(triagelog)
-
-
-  def _branchAtOrAbove(self, version):
-    """See if the current branch is at or above some cutoff point.
-
-       This is intended to help with backwards compatibility with older
-       branches.
-
-       '0.12.123.456' > '0.12'
-       '0.11.123.456' < '0.12'
-
-       Note that this method can break with some version strings out there:
-       '0.11.241.B'. In this case, if you don't specify enough detail
-       reach the 'B' it's fine. If that's a problem, the method will
-       have to be improved.
-    """
-
-    # Master is assumed to be past the cut off point.
-    if self.branch == 'master':
-      return True
-
-    if not re.match('\d+\.\d+\.\d+\.(\d+|B)', self.branch):
-      return True
-
-    # '0.12.123.456' -> ['0', '12', '123', '456']
-    branch_parts = self.branch.split('.')
-    version_parts = version.split('.')
-
-    # The first different section tells which is newer
-    for b, v in zip(branch_parts, version_parts):
-      if int(b) > int(v):
-        return True
-
-      if int(b) < int(v):
-        return False
-
-    # If all sections matched, see if zip truncated a difference
-    return len(branch_parts) >= len(version_parts)
+    self.add_bootstrap_steps()
+    self.add_cbuildbot_step(params, pass_revision)
 
   def _git_clear_and_checkout(self, repo, patch=None):
-    """
-    rm -rf and clone the basename of the repo passed without .git
+    """rm -rf and clone the basename of the repo passed without .git
 
     Args:
       repo: ssh: uri for the repo to be checked out
@@ -147,29 +85,14 @@ class CbuildbotFactory(object):
     clear_and_clone_cmd = 'rm -rf %s ; sleep 10 ;' % git_checkout_dir
     clear_and_clone_cmd += '%s clone %s;cd %s;' % (git_bin, repo,
                                                    git_checkout_dir)
-    #It's possible that branch can be coming from WithProperites set
-    #If the branch is master, then even if the branch is empty, it amounts
-    #to the same 'git checkout' or 'git checkout master'
-    #If self.branch is set to something otherthan master, that means, branch
-    #has been passed in and we want to honor the explicitly passed in branch
-
+    # It's possible that branch can be coming from WithProperites set
+    # If the branch is master, then even if the branch is empty, it amounts
+    # to the same 'git checkout' or 'git checkout master'
+    # If self.branch is set to something otherthan master, that means, branch
+    # has been passed in and we want to honor the explicitly passed in branch
     clear_and_clone_cmd += '%s checkout ' % git_bin
-
     if self.branch == 'master':
-      # Whitelist top of tree chrome PFQ builds to always use master
-      # as the branch checkout, this avoids us trying to clone a SVN
-      # revision that is passed to the builder. We are doing this in this
-      # fashion to avoid having to write a script that wraps our git call
-      # to confirm the hash we are passed. While technically we have access to
-      # branch/revision unfortunately the only way it is available is via
-      # WithProperties which is only transferred to something usable in a shell
-      # step.
-      if self.type and (self.CHROME_CBUILDBOT_TYPE == self.type):
-        clear_and_clone_cmd += 'master'
-      else:
-        # If branch is passed by the change source and we are not chrome pfq use
-        # use it.
-        clear_and_clone_cmd += '%(branch)s'
+      clear_and_clone_cmd += '%(branch)s'
     else:
       clear_and_clone_cmd += self.branch
 
@@ -184,9 +107,8 @@ class CbuildbotFactory(object):
                           name=msg,
                           description=msg)
 
-  def add_boiler_plate_steps(self):
-    """
-    Add the following boiler plate steps to the factory.
+  def add_bootstrap_steps(self):
+    """Bootstraps Chromium OS Build by syncing pre-requisite repositories.
 
     * gclient sync of /b
     * clearing of chromite[& crostools]
@@ -205,188 +127,53 @@ class CbuildbotFactory(object):
     if self.crostools_repo:
       self._git_clear_and_checkout(self.crostools_repo)
 
-  def cbuildbot_type(self, params, description_suffix='', haltOnFailure=True,
-                     pass_revision=False):
-    """Adds cbuildbot steps for pre flight queue builders.
+  def add_cbuildbot_step(self, params, pass_revision=False):
+    """Adds cbuildbot step for Chromium OS builds.
 
-    Cbuildbot includes the steps for syncing and building pre flight queue
-    builders.  This includes both chrome and standard pfq builders.
+    Cbuildbot includes all steps for building any Chromium OS config.
 
     Args:
       params:  Extra parameters for cbuildbot.
-      description_suffix:  Optional suffix to add to description that shows up
-        on dashboard.
       pass_revision: To pass the chrome revision desired into the build.
-      haltOnFailure: To halt build because of failure of cbuildbot step.  Useful
-        for setting to False for case of Chrome pfq where multiple cbuildbot
-        steps are invoked.
     """
-    # Gathers queued commits and drops them for cbuildbot to pick up.
-    self.f_cbuild.addStep(chromeos_revision_source.GitRevisionDropper,
-                          timeout=self.timeout)
-
-    # Triggered cbuildbots (pfq slaves) have this property set.
-    if self.is_master:
-      if self.type == self.CHROME_CBUILDBOT_TYPE:
-        self.f_cbuild.addStep(
-          trigger.Trigger(schedulerNames=['chrome_pre_flight_queue_slaves'],
-                          waitForFinish=False))
-      else:
-        self.f_cbuild.addStep(
-          trigger.Trigger(schedulerNames=['pre_flight_queue_slaves'],
-                          waitForFinish=False))
-
-    cbuild_cmd = ['chromite/buildbot/cbuildbot',
-                  shell.WithProperties("--buildnumber=%(buildnumber)s")]
-    if pass_revision:
-      cbuild_cmd.append(shell.WithProperties('--chrome_version=%(revision)s'))
-
-    if self._branchAtOrAbove('0.12') and not self.trybot:
-      cbuild_cmd += ['--buildbot']
+    cmd = ['chromite/buildbot/cbuildbot',
+           shell.WithProperties("--buildnumber=%(buildnumber)s"),

[scottz, 2011/11/23 01:50:16]

Nit: Pick either ' or "

+           '--buildroot=%s' % self.buildroot]
 
     if self.dry_run:
-      cbuild_cmd += ['--debug']
-
-    cbuild_cmd += ['--buildroot=%s' % self.buildroot]
-    cbuild_cmd += [('--revisionfile=%s' %
-                   chromeos_revision_source.PFQ_REVISION_FILE)]
-    # Below, WithProperties is appended to cbuild_cmd and rendered into a string
-    # for each specific build at build-time.  When clobber is None, it renders
-    # to an empty string.  When clobber is not None, it renders to the string
-    # --clobber.  Note: the :+ after clobber controls this behavior and is not
-    # a typo.
-    cbuild_cmd.append(WithProperties('%s', 'clobber:+--clobber'))
+      cmd += ['--debug']
 
     if self.trybot:
-      cbuild_cmd.append(WithProperties("--gerrit-patches='%(issue)s'"))
-
-    name = self.type
-    if description_suffix:
-      description = '%s_%s' % (name, description_suffix)
+      cmd.append(WithProperties("--gerrit-patches='%(issue)s'"))
     else:
-      description = name
+      cmd += ['--buildbot']
 
     if self.chrome_root:
-      cbuild_cmd.append('--chrome_root=%s' % self.chrome_root)
+      cmd.append('--chrome_root=%s' % self.chrome_root)
+
+    # Add properties from buildbot as necessary.
+    cmd.append(WithProperties('%s', 'clobber:+--clobber'))
+    if pass_revision:
+      cmd.append(shell.WithProperties('--chrome_version=%(revision)s'))
+
+    # Add additional parameters.
+    cmd += params.split()
+
+    # Trigger other slaves that should be run along with this builder.
+    if self.trigger_name:
+      self.f_cbuild.addStep(trigger.Trigger(schedulerNames=[self.trigger_name],
+                                            waitForFinish=False))
+      description = 'cbuildbot_master'
+    else:
+      description = 'master'
 
-    cbuild_cmd += params.split()
     self.f_cbuild.addStep(chromium_step.AnnotatedCommand,
-                          command=cbuild_cmd,
+                          command=cmd,
                           timeout=self.timeout,
-                          name=name,
+                          name='cbuildbot',
                           description=description,
-                          haltOnFailure=haltOnFailure,
                           usePTY=False)
 
-  def oneoff_type(self):
-    """
-    Add a step to run /home/chrome-bot/buildbot-oneoff --buildnumber=XXX.
-    """
-    cmd = ['/home/chrome-bot/buildbot-oneoff',
-           shell.WithProperties("--buildnumber=%(buildnumber)s"),
-           shell.WithProperties('%(branch)s)')]
-    self.f_cbuild.addStep(shell.ShellCommand,
-                          command=cmd,
-                          timeout=self.timeout,
-                          name='one off chromebot',
-                          description='one off chromebot')
-
-  def cbuild_type(self, params):
-    cbuild_cmd = ['crostools/cbuild',
-                  shell.WithProperties("--buildnumber=%(buildnumber)s")]
-    cbuild_cmd += ['--board=%s' % self.board,
-                   '--buildroot=%s' % self.buildroot]
-    # Below, WithProperties is appended to cbuild_cmd and rendered into a string
-    # for each specific build at build-time.  When clobber is None, it renders
-    # to an empty string.  When clobber is not None, it renders to the string
-    # --clobber.  Note: the :+ after clobber controls this behavior and is not
-    # a typo.
-    cbuild_cmd.append(WithProperties('%s', 'clobber:+--clobber'))
-    cbuild_cmd.append(WithProperties('%(branch)s'))
-    if self.variant:
-      cbuild_cmd.append('--variant=%s' % self.variant)
-    cbuild_cmd += params.split()
-    self.f_cbuild.addStep(shell.ShellCommand,
-                          command=cbuild_cmd,
-                          timeout=self.timeout,
-                          name='cbuild',
-                          description='cbuild')
-
-    logfile = os.path.join(self.buildroot, 'logs/cbuild.log')
-    self.add_triagelog_step(logfile)
-
-  def add_triagelog_step(self, logfile):
-    """
-    Add a step to the boiler plate to run triage log with the
-    specified log
-
-    Args:
-        logfile: path to the file to run triage log on.
-    """
-    triagelog_cmd = ['crostools/triagelog', '--nohighlighting', logfile]
-    self.f_cbuild.addStep(shell.ShellCommand,
-                          command=triagelog_cmd,
-                          timeout=900,
-                          name='triagelog',
-                          description='triagelog')
-
   def get_factory(self):
-    """
-    Return the produced factory.
-
-    Returns:
-        a buildbot factory object
-    """
+    """Returns the produced factory."""
     return self.f_cbuild
-
-
-class ChromeCbuildbotFactory(CbuildbotFactory):
-  """
-  Create a cbuildbot build factory for chrome.
-
-  Attributes:
-      board: What board to build (x86-generic x86-agz etc).
-      buildroot: --buildroot to pass to cbuild.
-      params: string of parameters to pass to the cbuildbot type
-      timeout: Timeout in seconds for the main command
-          (i.e. the type command). Default 9000 seconds.
-      is_master: Whether or not this pfq manages others.
-      chrome_rev_stages:  Array of strings designating chrome rev steps to run
-        in cbuildbot tot, latest_release, etc.
-      crostools_repo: git repo for crostools toolset.
-      chromite_repo: git repo for chromite toolset.
-      dry_run: Means cbuildbot --debug, or don't push anything (cbuildbot only)
-      chrome_root: directory to use for chrome.
-      pass_revision: to pass the chrome revision desired into the build.
-      factory: a factory with pre-existing steps to extend rather than start
-          fresh.  Allows composing.
-  """
-  def __init__(self, buildroot='/b/cbuild', params='', timeout=9000,
-               is_master=False, branch='master', chrome_rev_stages=None,
-               crostools_repo=CbuildbotFactory._default_crostools,
-               chromite_repo=CbuildbotFactory._default_chromite,
-               dry_run=False, chrome_root=None, factory=None,
-               slave_manager=True, chromite_patch=None, pass_revision=False):
-    # We don't inherit ChromeOS behavior for revisions.
-    if not factory:
-      factory = build_factory.BuildFactory()
-
-    CbuildbotFactory.__init__(self, type=CbuildbotFactory.CHROME_CBUILDBOT_TYPE,
-                              board=None,
-                              buildroot=buildroot, is_master=is_master,
-                              crostools_repo=crostools_repo,
-                              chromite_repo=chromite_repo,
-                              dry_run=dry_run,
-                              chrome_root=chrome_root,
-                              factory=factory,
-                              slave_manager=slave_manager,
-                              chromite_patch=chromite_patch)
-    # TODO(sosa): Remove legacy support.
-    if chrome_rev_stages:
-      for chrome_rev in chrome_rev_stages:
-        bot_params = '--chrome_rev=%s %s' % (chrome_rev, params)
-        self.cbuildbot_type(bot_params, description_suffix=chrome_rev,
-                            pass_revision=pass_revision, haltOnFailure=False)
-    else:
-      self.cbuildbot_type(params, haltOnFailure=False,
-                          pass_revision=pass_revision)