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

masters/master.chromiumos/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2011 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.
 
 # This is the buildmaster config file for the 'chromeos' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
@@ skipping 24 matching lines @@
 TREE_GATE_KEEPER = ActiveMaster.is_production_host
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
 # This is a dictionary that maps waterfall dashboard names to cbuildbot_configs.
 # In order to add a new dict, you must edit this first.
 _NAME_CONFIG_DICT = {
   'x86 generic PFQ': 'x86-generic-pre-flight-queue',
-  'x86 generic commit queue': 'x86-generic-commit-queue',
   'arm generic PFQ': 'arm-generic-bin',
   'tegra2 PFQ': 'arm-tegra2-bin',
+  'x86 generic commit queue': 'x86-generic-commit-queue',
+  'arm generic commit queue': 'arm-generic-commit-queue',
+  'tegra2 commit queue': 'arm-tegra2-commit-queue',
   'x86 generic full': 'x86-generic-full',
   'arm generic full': 'arm-generic-full',
   'tegra2 full': 'arm-tegra2-full',
   'tegra2 seaboard full': 'arm-tegra2-seaboard-full',
   'x86 pineview full': 'x86-pineview-full',
   'amd64 corei7 full': 'amd64-corei7-full',
   'amd64 generic full': 'amd64-generic-full',
   'x86 generic chrome PFQ': 'x86-generic-chrome-pre-flight-queue',
   'arm generic chrome PFQ': 'arm-generic-chrome-pre-flight-queue',
   'tegra2 chrome PFQ': 'arm-tegra2-chrome-pre-flight-queue',
@@ skipping 40 matching lines @@
   # Renamed 'src' to 'master' for git_buildbot.py
   branch='master',
   treeStableTimer=0,
   builderNames=[
      'chromiumos sdk',
   ])
 
 s_refresh_packages = Periodic(
   name='refresh_pkgs_scheduler',
   branch='master',
-  periodicBuildTimer=24*60*60, # 1 day
+  periodicBuildTimer=24 * 60 * 60, # 1 day
   builderNames=[
     'refresh packages',
   ])
 
 s_cq = Periodic(
   name='commit_queue_scheduler',
   branch='master',
-  periodicBuildTimer=5*60, # 5 minutes
+  periodicBuildTimer=5 * 60, # 5 minutes
   builderNames=[
     'x86 generic commit queue',
   ])
 
 s_asan = Scheduler(
   name='x86_generic_asan_scheduler',
   branch='master',
   treeStableTimer=0,
   builderNames=[
     'x86 generic ASAN',
@@ skipping 28 matching lines @@
 
 # Triggerable for other pre-flight-queue slaves. We use triggers so that
 # the other slaves are guaranteed to use the same sourcestamp as the main.
 s_pre_flight_queue_slaves = Triggerable(
   name='pre_flight_queue_slaves',
   builderNames=[
      'arm generic PFQ',
      'tegra2 PFQ',
   ])
 
+# Triggerable for other commit-queue slaves. We use triggers so that
+# the other slaves are guaranteed to use the same sourcestamp as the main.
+s_cq_slaves = Triggerable(
+  name='commit_queue_slaves',
+  builderNames=[
+     'arm generic commit queue',
+     'tegra2 commit queue',
+  ])
+
 # Only trigger fulls when we have a newly revved build.
 s_chromeos_full = Dependent(
   name='chromeos',
   upstream=s_pre_flight_queue,
   builderNames=[
      'arm generic full',
      'tegra2 full',
      'tegra2 seaboard full',
      'x86 generic full',
      'x86 pineview full',
      'amd64 generic full',
      'amd64 corei7 full',
   ])
 
 c['schedulers'] = [
     s_pre_flight_queue, s_pre_flight_queue_slaves,
     s_chrome_pre_flight_queue, s_chrome_pre_flight_queue_slaves,
     s_chromeos_full, s_chromiumos_sdk,
-    s_refresh_packages, s_cq, s_asan,
+    s_refresh_packages, s_cq, s_cq_slaves, s_asan,
 ]
 
 BUILDERS = []
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
 # The 'builders' list defines the Builders. Each one is configured with a
 # dictionary, using the following keys:
 #  name (required): the name used to describe this bilder
 #  slavename (required): which slave to use, must appear in c['slaves']
 #  builddir (required): which subdirectory to run the builder in
 #  factory (required): a BuildFactory to define how the build is run
 #  category (optional): it is not used in the normal 'buildbot' meaning. It is
 #                       used by gatekeeper to determine which steps it should
 #                       look for to close the tree.
 #
 
 # Cros helper functions to build builders and factories.
 
-def GetCBuildbotFactory(config, is_master=False):
+def GetCBuildbotFactory(config, trigger_name=None):
   """Returns cros buildbot factories."""
   return chromeos_factory.CbuildbotFactory(
       params=config, dry_run=not ActiveMaster.is_production_host,
       crostools_repo=None,
-      is_master=is_master).get_factory()
+      trigger_name=trigger_name).get_factory()
 
-def GetChromeCBuildbotFactory(config, is_master=False):
-  """Returns buildbot factories specifically for Chrome pfqs."""
-  return chromeos_factory.ChromeCbuildbotFactory(
-      params=config, chrome_rev_stages=[],
-      dry_run=not ActiveMaster.is_production_host,
-      crostools_repo=None,
-      is_master=is_master).get_factory()
-
-def AddBuilderDefinition(display_name, closer=True, chrome_factory=False,
-                         is_master=False):
+def AddBuilderDefinition(display_name, closer=True, trigger_name=None):
   """Adds a builder definition given by the args.
 
   Args:
     display_name: Name displayed on buildbot waterfall.
     closer:  Do we close the tree based on this build's failure.
-    chrome_factory: Use the chrome factory rather than normal factory.
-    is_master:  One set per pfq type.
+    trigger_name:  Name of the triggerable scheduler to fire for pfqs/commitq's.
   """
   def GetConfig():
     return _NAME_CONFIG_DICT.get(display_name, display_name)
 
   category = '1release full|info'
   if closer: category = '1release full|closer'
   build_dir = display_name.replace(' ', '-')
-  if chrome_factory:
-    factory = GetChromeCBuildbotFactory(GetConfig(), is_master)
-  else:
-    factory = GetCBuildbotFactory(GetConfig(), is_master)
+  factory = GetCBuildbotFactory(GetConfig(), trigger_name)
 
   BUILDERS.append({
     'name': display_name,
     'builddir': build_dir,
     'factory': factory,
     'category': category,
   })
 
 # Pre Flight Queues
-AddBuilderDefinition('x86 generic PFQ', is_master=True)
+AddBuilderDefinition('x86 generic PFQ', trigger_name='pre_flight_queue_slaves')
 AddBuilderDefinition('arm generic PFQ')
 AddBuilderDefinition('tegra2 PFQ')
 
 # Full Builders
 AddBuilderDefinition('x86 generic full')
 AddBuilderDefinition('arm generic full')
 AddBuilderDefinition('tegra2 full')
 AddBuilderDefinition('tegra2 seaboard full')
 AddBuilderDefinition('x86 pineview full')
 AddBuilderDefinition('amd64 corei7 full')
 
 # Chrome pre-flight builds.
-AddBuilderDefinition('x86 generic chrome PFQ', chrome_factory=True,
-                      is_master=True)
-AddBuilderDefinition('arm generic chrome PFQ', chrome_factory=True,)
-AddBuilderDefinition('tegra2 chrome PFQ', chrome_factory=True,)
+AddBuilderDefinition('x86 generic chrome PFQ',
+                     trigger_name='chrome_pre_flight_queue_slaves')
+AddBuilderDefinition('arm generic chrome PFQ')
+AddBuilderDefinition('tegra2 chrome PFQ')
 
 AddBuilderDefinition('chromiumos sdk',)
 
 ####### Non Closer build defs.
 
-AddBuilderDefinition('x86 generic commit queue', closer=False)
+AddBuilderDefinition('x86 generic commit queue', 
+                     trigger_name='commit_queue_slaves', closer=False)
+AddBuilderDefinition('arm generic commit queue', closer=False)
+AddBuilderDefinition('tegra2 commit queue', closer=False)
 AddBuilderDefinition('refresh packages', closer=False)
 AddBuilderDefinition('x86 generic ASAN', closer=False)
 AddBuilderDefinition('amd64 generic full', closer=False)
 
 c['builders'] = BUILDERS
 
 
 ####### BUILDSLAVES
 
 # the 'slaves' list defines the set of allowable buildslaves. Each element is a
@@ skipping 84 matching lines @@
       extraRecipients=['troopers@chromium.org'],
       sheriffs=['sheriff'],
       lookup=master_utils.FilterDomain(),
       use_getname=True))
 
 
 ####### PROJECT IDENTITY
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromiumos/'