tryserver.chromium.perf: convert chromium_trybot builders to remote_run

masters/master.tryserver.chromium.perf/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright 2014 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import socket
 
 # These modules come from scripts, which must be in the PYTHONPATH.
 from master import master_config
 from master import master_utils
 from master import slaves_list
 from master.builders_pools import BuildersPools
 from master.factory import annotator_factory
+from master.factory import remote_run_factory
 from master.try_job_http import TryJobHTTP
 from master.try_job_svn import TryJobSubversion
 
 import config
 import master_site_config
 
 ActiveMaster = master_site_config.ChromiumPerfTryServer
 
+def m_remote_run(recipe, factory_properties=None, **kwargs):
+  if not factory_properties:

[tandrii(chromium), 2016/07/19 12:44:32]

why do you need this and below condition if it's never true?

[Paweł Hajdan Jr., 2016/07/19 12:49:30]

It's reasonably generic and uniform with e.g. chromium.gpu.fyi .

We already duplicate this function, but at least I'm trying to limit the number
of variants.

Does that make sense? I'm fine with changing it if you insist - it's just a
tradeoff either way. Ideally it'll all disappear as we migrate off buildbot.

[tandrii(chromium), 2016/07/19 12:58:29]

fair enough.

+    factory_properties = {}
+  if not factory_properties.get('path_config'):
+    factory_properties['path_config'] = 'kitchen'
+  return remote_run_factory.RemoteRunFactory(
+      active_master=ActiveMaster,
+      repository='https://chromium.googlesource.com/chromium/tools/build.git',
+      recipe=recipe,
+      factory_properties=factory_properties,
+      **kwargs)
+
 
 MAIL_NOTIFIER = ActiveMaster.is_production_host
 LISTEN_TO_SVN = ActiveMaster.svn_url and ActiveMaster.is_production_host
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
 config.DatabaseSetup(c)
 
 c['change_source'] = []
 
 # Avoid merging requests.
 c['mergeRequests'] = False
 
 c['builders'] = []
 
 _category_index = enumerate(
     ('builders', 'android', 'webview', 'windows', 'mac', 'linux', 'cq', 'fyi'))
 
 _category_index = {category: index + 1 for index, category in _category_index}
 def _CategoryIndex(category):
   return _category_index[category]
 
 def _AddBisectBuilder(name, platform, category, upload_dir, timeout=2400):
   if platform == 'android':
     recipe = 'android/builder'
+    factory = annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory
   else:
     recipe = 'chromium'
+    factory = m_remote_run
   properties = {
       'append_deps_patch_sha': True,
       'build_url': master_config.GetGSUtilUrl('chrome-perf', upload_dir)}

[tandrii(chromium), 2016/07/19 12:44:32]

because of this... (see other comment)

   c['builders'].append({
       'name': '%s_bisect_builder' % name,
-      'factory': annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory(
+      'factory': factory(
           factory_properties=properties,
           recipe=recipe,
           timeout=timeout),
           'category': '%d%s|%s' % (
               _CategoryIndex('builders'), category, platform)
   })
 
 def _AddBisectBot(name, platform, category, timeout=3600, skip_suffix=False):
   if platform == 'android':
     recipe = 'bisection/android_bisect'
@@ skipping 142 matching lines @@
 # Must be at least 2x the number of slaves.
 c['eventHorizon'] = 200
 c['logCompressionLimit'] = False
 
 # Adjust the buildCaches to be 3x the number of slaves per builder.
 c['autoBuildCacheRatio'] = 3
 
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: