chromium.perf: convert chromium recipe builders to remote_run

masters/master.chromium.perf/master.cfg

 # Copyright 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.
 
 # This is the buildmaster config file for the 'chromium.perf' 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
 # 'mktap buildbot master').
 
 # It has one job: define a dictionary named BuildmasterConfig. This
@@ skipping 12 matching lines @@
 from buildbot.scheduler import Triggerable
 
 from common import chromium_utils
 
 from master import chromium_notifier
 from master import gitiles_poller
 from master import master_config
 from master import master_utils
 from master import slaves_list
 from master.factory import annotator_factory
+from master.factory import remote_run_factory
 
 import config
 import master_site_config
 
 ActiveMaster = master_site_config.ChromiumPerf
 
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
 # 'slavePortnum' defines the TCP port to listen on. This must match the value
 # configured into the buildslaves (with their --master option)
 c['slavePortnum'] = ActiveMaster.slave_port
 
 # Enable compression for any stdio log file larger than 10 MB.
 c['logCompressionLimit'] = 1024 * 1024 * 10 # 10 MB
 
 # Load the list of slaves.
 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumPerf')
 
 config.DatabaseSetup(c)
 
-def recipe_factory(recipe):
+def recipe_factory(recipe, **kwargs):
   f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster)
-  return f_annotations.BaseFactory(recipe=recipe)
+  return f_annotations.BaseFactory(recipe=recipe, **kwargs)
+
+def m_remote_run(recipe, **kwargs):

[emso, 2016/07/19 08:25:23]

I assume you are using m_remote_run to not overload remote_run. Is the
convention to use "m_" in this situation?

[Paweł Hajdan Jr., 2016/07/19 08:27:12]

Historically masters used m_ prefix for the "factory factory", e.g. m_annotator.
I originally preserved this convention, and for remote_run also for masters
which didn't seem to use it.

+  return remote_run_factory.RemoteRunFactory(
+      active_master=ActiveMaster,
+      repository='https://chromium.googlesource.com/chromium/tools/build.git',
+      recipe=recipe,
+      factory_properties={'path_config': 'kitchen'},
+      **kwargs)
 
 
 # ------------------------------------------------------------------------------
 # Change Sources.
 
 # Polls config.Master.trunk_url for changes
 master_poller = gitiles_poller.GitilesPoller(
     'https://chromium.googlesource.com/chromium/src')
 
 c['change_source'] = [master_poller]
@@ skipping 24 matching lines @@
     ('builders', 'android', 'win', 'mac', 'linux'))
 _category_index = {category: index + 1 for index, category in _category_index}
 def _CategoryIndex(category):
   return _category_index[category]
 
 
 _builder_names = []
 def _AddBuilder(name, platform, merge_requests=True, timeout=None,
                 target_bits=64):
   if platform == 'android':
+    factory = recipe_factory
     recipe = 'android/builder'
   else:
+    factory = m_remote_run
     recipe = 'chromium'
 
   factory_kwargs = dict(
     recipe=recipe,
     triggers=[_TriggerName(platform, target_bits)],
   )
   if timeout:
     factory_kwargs['timeout'] = timeout
 
   c['builders'].append({
       'name': name,
-      'factory': annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory(
-          **factory_kwargs),
+      'factory': factory(**factory_kwargs),
       'category':
           '%d%s|%s' % (_CategoryIndex('builders'), 'builders', platform),
       'mergeRequests': merge_requests,
       'auto_reboot': False,
   })
 
   _builder_names.append(name)
 
 
 _trigger_testers = {}
-def _AddTesterShard(name, recipe, platform, target_bits):
+def _AddTesterShard(name, factory, platform, target_bits):
   c['builders'].append({
       'name': name,
-      'factory': recipe_factory(recipe),
+      'factory': factory,
       'category': '%d%s|builder_testers' % (_CategoryIndex(platform), platform),
   })
 
   trigger_name = _TriggerName(platform, target_bits)
   if trigger_name not in _trigger_testers:
     _trigger_testers[trigger_name] = []
   _trigger_testers[trigger_name].append(name)
 
 
 def _AddTester(name, platform, num_shards=1, target_bits=64):
   if platform == 'android':
-    recipe = 'android/perf'
+    factory = recipe_factory('android/perf')
   else:
-    recipe = 'chromium'
+    factory = m_remote_run('chromium')
 
   if num_shards == 1:
-    _AddTesterShard(name, recipe, platform, target_bits)
+    _AddTesterShard(name, factory, platform, target_bits)
   else:
     for index in xrange(num_shards):
       indexed_name = '%s (%d)' % (name, index + 1)
-      _AddTesterShard(indexed_name, recipe, platform, target_bits)
+      _AddTesterShard(indexed_name, factory, platform, target_bits)
 
 
 c['builders'] = []
 
 
 _AddBuilder('Android Builder', 'android', target_bits=32, merge_requests=False)
 _AddBuilder('Android arm64 Builder', 'android', merge_requests=False)
 _AddBuilder('Win Builder', 'win', timeout=3600, target_bits=32)
 # TODO(dtu): decrease the timeout when https://crbug.com/617982 is fixed.
 _AddBuilder('Win x64 Builder', 'win', timeout=7200)
@@ skipping 88 matching lines @@
 
 ####### PROJECT IDENTITY
 
 # the 'projectName' string will be used to describe the project that this
 # buildbot is working on. For example, it is used as the title of the
 # waterfall HTML page. The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url