Revert of tryserver.chromium.win: convert chromium_trybot builders to remote_run

masters/master.tryserver.chromium.win/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import os
 import socket
 
 from buildbot.scheduler import Triggerable
 
 # These modules come from scripts, which must be in the PYTHONPATH.
 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.TryServerChromiumWin
 
 
 MAIL_NOTIFIER = ActiveMaster.is_production_host
@@ skipping 22 matching lines @@
 
 chromium_builders = []
 
 def baseFactory(recipe, factory_properties=None, **kwargs):
   fp = factory_properties or {}
   fp.update({
     '$recipe_engine': {'mode_flags': {'use_subprocess42': True}}
   })
   return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs)
 
-
-def m_remote_run(recipe, **kwargs):
-  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': 'win_chromium%s_ng' % targ,
-    'factory': m_remote_run(
+    'factory': baseFactory(
         'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
-    'slavebuilddir': 'remote_run'
+    # Share build directory with compatible existing builders to save space.
+    'slavebuilddir': 'win'
   }, {
     'name': 'win_chromium_compile%s_ng' % targ,
-    'factory': m_remote_run(
+    'factory': baseFactory(
         'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
-    'slavebuilddir': 'remote_run'
+    # Share build directory with compatible existing builders to save space.
+    'slavebuilddir': 'win'
   }])
 
 chromium_builders.append({
   'name': 'win10_chromium_x64_rel_ng',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win',
 })
 
 chromium_builders.append({
   'name': 'win10_chromium_x64_rel_ng_exp',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win',
 })
 
 chromium_builders.append({
   'name': 'win_archive',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
 })
 
 chromium_builders.append({
   'name': 'win_x64_archive',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
 })
 
 chromium_builders.append({
   'name': 'win_chromium_x64_rel_ng',
-  'factory': m_remote_run(
+  'factory': baseFactory(
       'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
-  'slavebuilddir': 'remote_run'
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win'
 })
 
 chromium_builders.extend([{
     'name': 'win8_chromium_gyp_rel',
-    'factory': m_remote_run('chromium_trybot'),
-    'slavebuilddir': 'remote_run',
+    'factory': baseFactory('chromium_trybot'),
+    'slavebuilddir': 'win_gyp',
   },{
     'name': 'win8_chromium_gyp_dbg',
-    'factory': m_remote_run('chromium_trybot'),
-    'slavebuilddir': 'remote_run',
+    'factory': baseFactory('chromium_trybot'),
+    'slavebuilddir': 'win_gyp',
   },{
     'name': 'win8_chromium_gn_upload',
     'factory': baseFactory('chromium_gn_upload'),
     'slavebuilddir': 'win_gn',
   },
 ])
 
 chromium_builders.append({
   'name': 'win_upload_clang',
   'factory': baseFactory('chromium_upload_clang'),
   'slavebuilddir': 'win_upload_clang',
 })
 
 chromium_builders.append({
     'name': 'win_pgo',
     'factory':  baseFactory('chromium_pgo', timeout=24000),
     'slavebuilddir': 'win',
 })
 
 chromium_builders.append({
     'name': 'win_chrome_official',
-    'factory': m_remote_run('chromium_trybot', timeout=4800),
-    'slavebuilddir': 'remote_run',
+    'factory': baseFactory('chromium', timeout=4800),
+    'slavebuilddir': 'win_chrome',
 })
 
 chromium_builders.append({
   'name': 'win_chromium_syzyasan_rel',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win',
 })
 
 # Experimental clang/win bots
 chromium_builders.append({
   'name': 'win_clang',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_dbg',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_rel',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_x64_dbg',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_x64_rel',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 
 # Optional GPU tryserver.
 chromium_builders.append({
   'name': 'win_optional_gpu_tests_rel',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run'
+  'factory': baseFactory('chromium_trybot', timeout=3600),
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win'
 })
 
 # NaCl SDK try bots
 b_win_nacl_sdk = {
   'name': 'win_nacl_sdk',
   'factory': baseFactory('nacl/sdk'),
 }
 
 # NaCl SDK build-only try bots
 b_win_nacl_sdk_build = {
@@ skipping 191 matching lines @@
 #  base.make_stop_form = hack_stop(base.make_stop_form)
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: