Adding trybots for Periodic and PerCommit Housekeeper

master/master_builders_cfg.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.
 
 # Sets up all the builders we want this buildbot master to run.
 
 from skia_master_scripts import factory as skia_factory
-from skia_master_scripts import housekeeping_percommit_factory
-from skia_master_scripts import housekeeping_periodic_factory
 from skia_master_scripts import utils
-from skia_master_scripts.utils import MakeBuilderSet, MakeAndroidBuilderSet, \
-                                      MakeChromeOSBuilderSet, MakeIOSBuilderSet
+from skia_master_scripts.utils import MakeBuilderSet, \
+                                      MakeAndroidBuilderSet, \
+                                      MakeChromeOSBuilderSet, \
+                                      MakeIOSBuilderSet, \
+                                      MakeHousekeeperBuilderSet
 
 # Directory where we want to record performance data
 #
 # TODO(epoger): consider changing to reuse existing config.Master.perf_base_url,
 # config.Master.perf_report_url_suffix, etc.
 perf_output_basedir_linux = '../../../../perfdata'
 perf_output_basedir_mac = perf_output_basedir_linux
 perf_output_basedir_windows = '..\\..\\..\\..\\perfdata'
 
 defaults = {}
 
 def Update(config, active_master, c):
   helper = utils.SkiaHelper(defaults)
-  B = helper.Builder
-  F = helper.Factory
 
   #
   # Default (per-commit) Scheduler for Skia. Only use this for builders which
   # do not care about commits outside of SKIA_PRIMARY_SUBDIRS.
   #
   helper.AnyBranchScheduler('skia_rel', branches=utils.SKIA_PRIMARY_SUBDIRS)
 
   #
   # Periodic Scheduler for Skia. The buildbot master follows UTC.
   # Setting it to 7AM UTC (2 AM EST).
@@ skipping 228 matching lines @@
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
       environment_variables={'GYP_DEFINES': 'skia_os=ios'},
       gm_image_subdir=None,
       perf_output_basedir=None,
       do_release=False,
       do_bench=False)
 
   # House Keeping
   defaults['category'] = ' housekeeping'
-  B('Skia_PerCommit_House_Keeping', 'f_skia_percommit_house_keeping',
-      scheduler='skia_rel')
-  F('f_skia_percommit_house_keeping',
-      housekeeping_percommit_factory.HouseKeepingPerCommitFactory(
-        do_upload_results=do_upload_results,
-        target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-        builder_name='Skia_PerCommit_House_Keeping',
-      ).Build())
-  B('Skia_Periodic_House_Keeping', 'f_skia_periodic_house_keeping',
-      scheduler='skia_periodic')
-  F('f_skia_periodic_house_keeping',
-      housekeeping_periodic_factory.HouseKeepingPeriodicFactory(
-        do_upload_results=do_upload_results,
-        target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-        builder_name='Skia_Periodic_House_Keeping',
-      ).Build())
+  MakeHousekeeperBuilderSet(
+      helper=helper,
+      do_trybots=True,
+      do_upload_results=do_upload_results)
 
   # "Special" bots, running on Linux
   defaults['category'] = 'Linux-Special'
   MakeBuilderSet(
       helper=helper,
       builder_base_name='Skia_Linux_NoGPU_%s_32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
       environment_variables=
           {'GYP_DEFINES': 'skia_scalar=float skia_gpu=0 skia_arch_width=64'},
@@ skipping 12 matching lines @@
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
       environment_variables=
           {'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
       gm_image_subdir=None,
       perf_output_basedir=None, # no perf measurement for debug builds
       bench_pictures_cfg='no_gpu',
       do_release=False,
       do_bench=False)
 
   return helper.Update(c)