Add support for "additional_mirrors" property in trybot configs.

scripts/slave/recipes/chromium_trybot.py

 # Copyright 2013 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 collections
 
 from recipe_engine.types import freeze
 
 DEPS = [
   'amp',
@@ skipping 188 matching lines @@
   return ext in ['.c', '.cc', '.cpp', '.h', '.java', '.mm']
 
 def _RunStepsInternal(api):
   def get_bot_config(mastername, buildername):
     master_dict = api.chromium_tests.trybots.get(mastername, {})
     return master_dict.get('builders', {}).get(buildername)
 
   mastername = api.properties.get('mastername')
   buildername = api.properties.get('buildername')
   bot_config = get_bot_config(mastername, buildername)
+  additional_trybot_mirrors = bot_config.get('additional_mirrors')
 
   # TODO(sergiyb): This is a temporary hack to run GPU tests on tryserver
   # only. This should be removed when we will convert chromium.gpu waterfall
   # to swarming and be able to replicate the tests to tryserver automatically.
   master = api.properties['mastername']
   builder = api.properties['buildername']
   enable_gpu_tests = builder in CHROMIUM_GPU_DIMENSION_SETS.get(master, {})
 
   api.chromium_tests.configure_build(
       bot_config['mastername'],
       bot_config['buildername'],
+      additional_trybot_mirrors,
       override_bot_type='builder_tester')
 
   api.chromium_tests.configure_swarming('chromium', precommit=True)
 
   api.chromium.apply_config('trybot_flavor')
+  # TODO(kbr): the "optional" flag is only being used during the
+  # transition from the GPU recipe to the Chromium recipe.
   if enable_gpu_tests:
-    api.chromium.apply_config('archive_gpu_tests')
-    api.chromium.apply_config('chrome_with_codecs')
+    api.chromium.apply_config('archive_gpu_tests', optional=True)
+    api.chromium.apply_config('chrome_with_codecs', optional=True)
 
   if api.properties.get('patch_project') == 'blink':  # pragma: no cover
     raise Exception('CLs which use blink project are not supported. '
                     'Please re-create the CL using fresh checkout after '
                     'the blink merge.')
 
-  bot_update_step, master_dict, test_spec = \
+  bot_update_step, master_dicts, test_specs = \
       api.chromium_tests.prepare_checkout(
           bot_config['mastername'],
-          bot_config['buildername'])
+          bot_config['buildername'],
+          additional_trybot_mirrors)
 
   tests = list(api.chromium_tests.tests_for_builder(
       bot_config['mastername'],
       bot_config['buildername'],
       bot_update_step,
-      master_dict,
+      master_dicts[0],
       override_bot_type='builder_tester'))
   tester = bot_config.get('tester', '')
   if tester:
-    test_config = master_dict.get('builders', {}).get(tester)
+    test_config = master_dicts[0].get('builders', {}).get(tester)
     for key, value in test_config.get('swarming_dimensions', {}).iteritems():
       api.swarming.set_default_dimension(key, value)
     tests.extend(api.chromium_tests.tests_for_builder(
         bot_config['mastername'],
         tester,
         bot_update_step,
-        master_dict,
+        master_dicts[0],
         override_bot_type='builder_tester'))
+  if additional_trybot_mirrors:
+    i = 1
+    for mirror in additional_trybot_mirrors:

[Sergey Berezin, 2016/01/06 01:50:56]

nit: if tests_for_builder() takes master_dicts and iterates over them, this code
wouldn't be necessary.

+      tests.extend(api.chromium_tests.tests_for_builder(
+        mirror['mastername'],
+        mirror['buildername'],
+        bot_update_step,
+        master_dicts[i],
+        override_bot_type='builder_tester'))
+      tester = mirror.get('tester', '')
+      if tester:
+        tests.extend(api.chromium_tests.tests_for_builder(
+          mirror['mastername'],
+          tester,
+          bot_update_step,
+          master_dicts[i],
+          override_bot_type='builder_tester'))
+      i += 1
 
   if enable_gpu_tests:
     tests.extend(api.gpu.create_tests(
         bot_update_step.presentation.properties['got_revision'],
         bot_update_step.presentation.properties['got_revision'],
         enable_swarming=True,
         swarming_dimension_sets=CHROMIUM_GPU_DIMENSION_SETS[master][builder]))
 
   affected_files = api.tryserver.get_files_affected_by_patch()
 
@@ skipping 24 matching lines @@
         api.chromium_tests.steps.GTestTest('blink_heap_unittests'),
         api.chromium_tests.steps.GTestTest('blink_platform_unittests'),
         api.chromium_tests.steps.GTestTest('webkit_unit_tests'),
         api.chromium_tests.steps.GTestTest('wtf_unittests'),
     ])
 
   compile_targets, tests_including_triggered = \
       api.chromium_tests.get_compile_targets_and_tests(
           bot_config['mastername'],
           bot_config['buildername'],
-          master_dict,
-          test_spec,
+          master_dicts,
+          additional_trybot_mirrors,
+          test_specs,
           override_bot_type='builder_tester',
           override_tests=tests)
 
   test_targets = sorted(set(
       all_compile_targets(api, tests + tests_including_triggered)))
   additional_compile_targets = sorted(set(compile_targets) -
                                       set(test_targets))
   test_targets, compile_targets = \
       api.chromium_tests.analyze(affected_files,
                                  test_targets,
@@ skipping 26 matching lines @@
       tests.extend(blink_tests)
       tests_including_triggered.extend(blink_tests)
       for test in blink_tests:
         compile_targets.extend(test.compile_targets(api))
       compile_targets = sorted(set(compile_targets))
 
     api.chromium_tests.compile_specific_targets(
         bot_config['mastername'],
         bot_config['buildername'],
         bot_update_step,
-        master_dict,
+        master_dicts,
         compile_targets,
         tests_including_triggered,
         override_bot_type='builder_tester')
   else:
     # Even though the patch doesn't require a compile on this platform,
     # we'd still like to run tests not depending on
     # compiled targets (that's obviously not covered by the
     # 'analyze' step) if any source files change.
     if any([is_source_file(api, f) for f in affected_files]):
       tests = [t for t in tests if not t.compile_targets(api)]
@@ skipping 717 matching lines @@
                            api.test_utils.canned_test_output(passing=True))
   )
 
   yield (
     api.test('use_v8_patch_on_blink_trybot') +
     props(mastername='tryserver.blink',
           buildername='mac_blink_rel',
           patch_project='v8') +
     api.platform.name('mac')
   )