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

masters/master.chromiumos/master.cfg

Index: masters/master.chromiumos/master.cfg
diff --git a/masters/master.chromiumos/master.cfg b/masters/master.chromiumos/master.cfg
index 1ffa88b9481392e4c26d23b8a8760770bcbb6005..f25310edee5e9c4a57ba48ef50a157e229aeaead 100644
--- a/masters/master.chromiumos/master.cfg
+++ b/masters/master.chromiumos/master.cfg
@@ -42,9 +42,11 @@ c = BuildmasterConfig = {}
 # 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',
@@ -105,7 +107,7 @@ s_chromiumos_sdk = Scheduler(
 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',
   ])
@@ -113,7 +115,7 @@ s_refresh_packages = Periodic(
 s_cq = Periodic(
   name='commit_queue_scheduler',
   branch='master',
-  periodicBuildTimer=5*60, # 5 minutes
+  periodicBuildTimer=5 * 60, # 5 minutes
   builderNames=[
     'x86 generic commit queue',
   ])
@@ -162,6 +164,15 @@ s_pre_flight_queue_slaves = Triggerable(
      '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',
@@ -180,7 +191,7 @@ 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 = []
@@ -201,30 +212,20 @@ BUILDERS = []
 
 # 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()
-
-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()
+      trigger_name=trigger_name).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)
@@ -232,10 +233,7 @@ def AddBuilderDefinition(display_name, closer=True, chrome_factory=False,
   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,
@@ -245,7 +243,7 @@ def AddBuilderDefinition(display_name, closer=True, chrome_factory=False,
   })
 
 # 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')
 
@@ -258,16 +256,19 @@ 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)