tryserver.chromium.linux: convert chromium_trybot builders to remote_run

masters/master.tryserver.chromium.linux/master.cfg

Index: masters/master.tryserver.chromium.linux/master.cfg
diff --git a/masters/master.tryserver.chromium.linux/master.cfg b/masters/master.tryserver.chromium.linux/master.cfg
index c76f9dafdc71c902441fcc14bd500fbf1fe53db8..f5213bf9e0f1ba5b920d6ce045d6c4082c8129f0 100644
--- a/masters/master.tryserver.chromium.linux/master.cfg
+++ b/masters/master.tryserver.chromium.linux/master.cfg
@@ -17,6 +17,7 @@ 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
 
@@ -65,126 +66,124 @@ def baseFactory(recipe, factory_properties=None, **kwargs):
 
   return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs)
 
+
+def m_remote_run(recipe, **kwargs):
+  # Disable "max time without output" timeout if total build timeout
+  # is in effect.
+  if 'max_time' in kwargs and 'timeout' not in kwargs:
+    kwargs['timeout'] = None
+  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)
+
+
 for targ in ('_rel', '_dbg'):
   chromium_builders.extend([{
     'name': 'linux_chromium_compile%s_ng' % targ,
-    'factory': baseFactory('chromium_trybot', timeout=3600),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'linux'
+    'factory': m_remote_run('chromium_trybot', timeout=3600),
+    'slavebuilddir': 'remote_run'
   }, {
     'name': 'linux_chromium%s_ng' % targ,
-    'factory': baseFactory(
+    'factory': m_remote_run(
         'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'linux'
+    'slavebuilddir': 'remote_run'
   }, {
     'name': 'linux_chromium_chromeos%s_ng' % targ,
-    'factory': baseFactory(
+    'factory': m_remote_run(
         'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'linux_chromeos'
+    'slavebuilddir': 'remote_run'
   }, {
     'name': 'linux_chromium_chromeos_compile%s_ng' % targ,
-    'factory': baseFactory(
+    'factory': m_remote_run(
         'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'linux_chromeos'
+    'slavebuilddir': 'remote_run'
   }, {
     'name': 'linux_chromium_gn_chromeos%s' % targ,
-    'factory': baseFactory(
+    'factory': m_remote_run(
         'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-    'slavebuilddir': 'linux_chromium_gn_chromeos'
+    'slavebuilddir': 'remote_run'
   }])
 
 chromium_builders.append({
     'name': 'linux_chromium_chromeos_asan_rel_ng',
-    'factory': baseFactory('chromium_trybot'),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'linux_chromeos_asan',
+    'factory': m_remote_run('chromium_trybot'),
+    'slavebuilddir': 'remote_run',
 })
 
 chromium_builders.append({
   'name': 'linux_chromium_chromeos_ozone_rel_ng',
-  'factory': baseFactory(
+  'factory': m_remote_run(
       'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux_chromeos'
+  'slavebuilddir': 'remote_run'
 })
 
 for board in chromeos_boards:
   chromium_builders.append({
       'name': 'chromeos_%s_chromium_compile_only_ng' % (board,),
-      'factory': baseFactory(
+      'factory': m_remote_run(
           'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-      # Share build directory with compatible existing builders to save space.
-      'slavebuilddir': 'chromeos_%s' % (board,),
+      'slavebuilddir': 'remote_run',
   })
 
 chromium_builders.append({
     'name': 'linux_chromium_msan_rel_ng',
-    'factory': baseFactory('chromium_trybot'),
-    'slavebuilddir': 'linux_msan',
+    'factory': m_remote_run('chromium_trybot'),
+    'slavebuilddir': 'remote_run',
 })
 
 chromium_builders.append({
     'name': 'linux_chromium_chromeos_msan_rel_ng',
-    'factory': baseFactory('chromium_trybot'),
-    'slavebuilddir': 'linux_chromeos_msan',
+    'factory': m_remote_run('chromium_trybot'),
+    'slavebuilddir': 'remote_run',
 })
 
 chromium_builders.append({
     'name': 'linux_chromium_tsan_rel_ng',
-    'factory': baseFactory('chromium_trybot'),
-    'slavebuilddir': 'linux_tsan',
+    'factory': m_remote_run('chromium_trybot'),
+    'slavebuilddir': 'remote_run',
 })
 
 chromium_builders.append({
     'name': 'linux_chromium_cfi_rel_ng',
-    'factory': baseFactory('chromium_trybot',
-                                       timeout=12000),
-    'slavebuilddir': 'linux_cfi',
+    'factory': m_remote_run('chromium_trybot', timeout=12000),
+    'slavebuilddir': 'remote_run',
 })
 
 chromium_builders.extend([{
     'name': 'linux_arm',
-    'factory': baseFactory('chromium_trybot'),
-    'slavebuilddir': 'linux_arm',
+    'factory': m_remote_run('chromium_trybot'),
+    'slavebuilddir': 'remote_run',
   },
 ])
 
 chromium_builders.append({
   'name': 'linux_chromium_compile_dbg_32_ng',
-  'factory': baseFactory(
+  'factory': m_remote_run(
       'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux'
+  'slavebuilddir': 'remote_run'
 })
 
 chromium_builders.append({
   'name': 'linux_chromium_dbg_32_ng',
-  'factory': baseFactory('chromium_trybot'),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux'
+  'factory': m_remote_run('chromium_trybot'),
+  'slavebuilddir': 'remote_run'
 })
 
 chromium_builders.append({
   'name': 'linux_chromium_archive_rel_ng',
-  'factory': baseFactory(
+  'factory': m_remote_run(
       'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-  # Share build directory with compatible existing builders to save space.
-  # Do not clobber build directories of incremental builders though,
-  # to keep them fast.

[tandrii(chromium), 2016/07/20 10:48:18]

what about this comment? is still applicable?

[Paweł Hajdan Jr., 2016/07/20 10:53:59]

It is. But it's handled entirely recipe side - see my other comment pointing to
the change.

One of the reasons for that is on swarming we won't have the buildbot master
config, but we will have the recipes.

-  'slavebuilddir': 'linux_clobber'
+  'slavebuilddir': 'remote_run'
 })
 
 chromium_builders.append({
   'name': 'linux_chromium_clobber_rel_ng',
-  'factory': baseFactory(
+  'factory': m_remote_run(
       'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-  # Share build directory with compatible existing builders to save space.
-  # Do not clobber build directories of incremental builders though,
-  # to keep them fast.

[tandrii(chromium), 2016/07/20 10:48:18]

ditto

-  'slavebuilddir': 'linux_clobber'
+  'slavebuilddir': 'remote_run'
 })
 
 # This bot builds and upload GN binaries to cloud storage.
@@ -205,48 +204,44 @@ chromium_builders.append({
 # Chromecast builders using chromium_trybot
 chromium_builders.extend([{
     'name': 'cast_shell_linux',
-    'factory': baseFactory(
+    'factory': m_remote_run(
         'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
   },
 ])
 
 chromium_builders.extend([{
     'name': 'blimp_linux_dbg',
-    'factory': baseFactory(
+    'factory': m_remote_run(
         'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-    'slavebuilddir': 'linux_blimp',
+    'slavebuilddir': 'remote_run',
   },
 ])
 
 b_linux_site_isolation = {
   'name': 'linux_site_isolation',
-  'factory': baseFactory('chromium_trybot'),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux',
+  'factory': m_remote_run('chromium_trybot'),
+  'slavebuilddir': 'remote_run',
 }
 
 b_linux_chromium_asan_rel_ng = {
   'name': 'linux_chromium_asan_rel_ng',
-  'factory': baseFactory(
+  'factory': m_remote_run(
       'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux_asan',
+  'slavebuilddir': 'remote_run',
 }
 
 # Optional GPU tryserver
 chromium_builders.append({
   'name': 'linux_optional_gpu_tests_rel',
-  'factory': baseFactory('chromium_trybot', timeout=3600),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux'
+  'factory': m_remote_run('chromium_trybot', timeout=3600),
+  'slavebuilddir': 'remote_run'
 })
 
 # Optional browser-side navigation trybot
 b_linux_chromium_browser_side_navigation_rel = {
   'name': 'linux_chromium_browser_side_navigation_rel',
-  'factory': baseFactory('chromium_trybot', timeout=3600),
-  # Share build directory with compatible existing builders to save space.
-  'slavebuilddir': 'linux'
+  'factory': m_remote_run('chromium_trybot', timeout=3600),
+  'slavebuilddir': 'remote_run'
 }
 
 # NaCl SDK try bots