chromium.perf: convert chromium recipe builders to remote_run

masters/master.chromium.perf/master.cfg

Index: masters/master.chromium.perf/master.cfg
diff --git a/masters/master.chromium.perf/master.cfg b/masters/master.chromium.perf/master.cfg
index 7c93d19fe45c2e307dc18bb0e96e116fd453e637..cd6be2b29f202a1f10fbcfe231029d5dfc406701 100644
--- a/masters/master.chromium.perf/master.cfg
+++ b/masters/master.chromium.perf/master.cfg
@@ -30,6 +30,7 @@ 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
@@ -53,9 +54,17 @@ 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)
 
 
 # ------------------------------------------------------------------------------
@@ -100,8 +109,10 @@ _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(
@@ -113,8 +124,7 @@ def _AddBuilder(name, platform, merge_requests=True, timeout=None,
 
   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,
@@ -125,10 +135,10 @@ def _AddBuilder(name, platform, merge_requests=True, timeout=None,
 
 
 _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),
   })
 
@@ -140,16 +150,16 @@ def _AddTesterShard(name, recipe, platform, target_bits):
 
 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'] = []