master.tryserver.infra: set path_config=kitchen for remote_run builders

scripts/master/master_gen.py

 # 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.
 
 import ast
 import os
 
 from buildbot.changes.filter import ChangeFilter
 from buildbot.schedulers.basic import SingleBranchScheduler
 from buildbot.schedulers.timed import Nightly
@@ skipping 72 matching lines @@
   # useful for most projects. We should fix that.
   c['buildHorizon'] = 3000
   c['logHorizon'] = 3000
   # Must be at least 2x the number of slaves.
   c['eventHorizon'] = 200
 
 
 def _ComputeBuilders(builders, m_annotator, active_master_cls):
   actual_builders = []
 
-  default_properties = builders.get('default_properties')
-
   def cmp_fn(a, b):
     a_cat = builders['builders'][a].get('category')
     b_cat = builders['builders'][b].get('category')
     if a_cat != b_cat:
       return 1 if a_cat > b_cat else -1
     if a != b:
       return 1 if a > b else -1
     return 0
 
   for builder_name in sorted(builders['builders'], cmp=cmp_fn):
     builder_data = builders['builders'][builder_name]
     has_schedulers = bool(
         builder_data.get('scheduler', builder_data.get('schedulers')))
 
     # We will automatically merge all build requests for any
     # builder that can be scheduled; this is normally the behavior
     # we want for repo-triggered builders and cron-triggered builders.
     # You can override this behavior by setting the mergeRequests field though.
     merge_requests = builder_data.get('mergeRequests', has_schedulers)
 
     slavebuilddir = builder_data.get('slavebuilddir',
                                      util.safeTranslate(builder_name))
 
-    if default_properties:
-      props = default_properties.copy()
-      props.update(builder_data.get('properties', {}))
-    else:
-      props = builder_data.get('properties')
+    props = {}
+    props.update(builders.get('default_properties', {}).copy())
+    if builder_data.get('use_remote_run'):
+      props.update(builders.get('default_remote_run_properties', {}).copy())
+    props.update(builder_data.get('properties', {}))
 
     if builder_data.get('use_remote_run'):
       factory = remote_run_factory.RemoteRunFactory(
           active_master=active_master_cls,
           repository=builder_data.get(
               'repository', builders.get('default_remote_run_repository')),
           recipe=builder_data['recipe'],
           max_time=builder_data.get('builder_timeout_s'),
           factory_properties=props,
       )
@@ skipping 106 matching lines @@
         pollInterval=300,
         revlinktmpl=rev_link_template))
 
   # We have to set the tag_comparator to something, but if we have multiple
   # repos, the tag_comparator will not work properly (it's meaningless).
   # It's not clear if there's a good answer to this.
   if change_source:
     tag_comparator = change_source[0].comparator
 
   return change_source, tag_comparator