Adding trybots for Periodic and PerCommit Housekeeper

master/skia_master_scripts/utils.py

 # Copyright (c) 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.
 
 
 """Miscellaneous utilities needed by the Skia buildbot master."""
 
 
 import httplib2
 import re
 
 
 # requires Google APIs client library for Python; see
 # https://code.google.com/p/google-api-python-client/wiki/Installation
 from apiclient.discovery import build
 from buildbot.scheduler import AnyBranchScheduler
 from buildbot.schedulers import timed
 from buildbot.schedulers.filter import ChangeFilter
 from buildbot.util import NotABranch
 from config_private import TRY_SVN_BASEURL
 from master import master_config
 from master.builders_pools import BuildersPools
 from master import try_job_svn
 from oauth2client.client import SignedJwtAssertionCredentials
 from skia_master_scripts import android_factory
 from skia_master_scripts import chromeos_factory
 from skia_master_scripts import factory as skia_factory
+from skia_master_scripts import housekeeping_percommit_factory, \
+                                housekeeping_periodic_factory
 from skia_master_scripts import ios_factory
 
 
 TRYBOT_NAME_SUFFIX = '_Trybot'
 
 
 class SkiaChangeFilter(ChangeFilter):
   """Skia specific subclass of ChangeFilter."""
 
   def __init__(self, builders, **kwargs):
@@ skipping 394 matching lines @@
 def _MakeBuilderAndMaybeTrybotSet(do_trybots=True, **kwargs):
   _MakeBuilderSet(is_trybot=False, **kwargs)
   if do_trybots:
     _MakeBuilderSet(is_trybot=True, **kwargs)
 
 
 def MakeBuilderSet(**kwargs):
   _MakeBuilderAndMaybeTrybotSet(factory_type=skia_factory.SkiaFactory, **kwargs)
 
 
+def MakeHousekeeperBuilderSet(helper, do_trybots, do_upload_results):
+  B = helper.Builder
+  F = helper.Factory
+
+  builder_factory_scheduler = [
+    # The Percommit housekeeper
+    ('Skia_PerCommit_House_Keeping',
+     housekeeping_percommit_factory.HouseKeepingPerCommitFactory,
+     'skia_rel'),
+    # The Periodic housekeeper
+    ('Skia_Periodic_House_Keeping',
+     housekeeping_periodic_factory.HouseKeepingPeriodicFactory,
+     'skia_periodic'),
+  ]
+  if do_trybots:
+    # Add the corresponding trybot builders to the above list.
+    builder_factory_scheduler.extend([
+        (builder + TRYBOT_NAME_SUFFIX, factory, 'skia_try')
+        for (builder, factory, _scheduler) in builder_factory_scheduler])
+
+  for (builder_name, factory, scheduler) in builder_factory_scheduler:
+    B(builder_name, 'f_%s' % builder_name, scheduler=scheduler)
+    F('f_%s' % builder_name,
+      factory(
+        do_upload_results=do_upload_results,
+        target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+        builder_name=builder_name,
+        do_patch_step=(scheduler == 'skia_try'),
+      ).Build())
+
+
 def MakeAndroidBuilderSet(extra_branches=None, **kwargs):
   if not extra_branches:
     extra_branches = []
   extra_branches.append('android')
   _MakeBuilderAndMaybeTrybotSet(factory_type=android_factory.AndroidFactory,
                                 extra_branches=extra_branches,
                                 **kwargs)
 
 
 def MakeChromeOSBuilderSet(**kwargs):
@@ skipping 43 matching lines @@
   # request is associated with a change but the revisions match (#5 above).
   if req1.source.changes and not req2.source.changes:
     return False
   if not req1.source.changes and req2.source.changes:
     return False
   if not (req1.source.changes and req2.source.changes):
     if req1.source.revision != req2.source.revision:
       return False
   
   return True