Add recipe for split AMP/local CQ.

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.
 
 from infra.libs.infra_types import freeze
 
 DEPS = [
   'bot_update',
   'chromium',
   'chromium_android',
@@ skipping 348 matching lines @@
         master_dict,
         override_bot_type='builder_tester'))
 
   if enable_gpu_tests:
     tests.extend(api.gpu.create_tests(
         bot_update_step.presentation.properties['got_revision'],
         bot_update_step.presentation.properties['got_webkit_revision'],
         enable_swarming=True,
         swarming_dimension_sets=CHROMIUM_GPU_DIMENSION_SETS[master][builder]))
 
+  amp_tests = list(bot_config.get('amp_tests', []))

[navabi, 2015/04/22 16:16:48]

This isn't doing what I expected for the 'Android Tests (amp split)' bot. From
the expectations, it looks like it is coming back with an empty list.

[Paweł Hajdan Jr., 2015/04/22 16:25:10]

That's because bot_config here refers to the trybot. Looks like there is no
trybot configured to mirror 'Android Tests (amp split)', and even then, no
special logic should be needed in this file.

+
   # TODO(phajdan.jr): Remove special case for layout tests.
   # This could be done by moving layout tests to main waterfall.
   affected_files = api.tryserver.get_files_affected_by_patch()
   if (any([f.startswith('third_party/WebKit') for f in affected_files]) and
       buildername in CHROMIUM_BLINK_TESTS_BUILDERS):
     tests.append(api.chromium.steps.BlinkTest())
 
   compile_targets, tests_including_triggered = \
       api.chromium_tests.get_compile_targets_and_tests(
           bot_config['mastername'],
           bot_config['buildername'],
           master_dict,
           override_bot_type='builder_tester',
-          override_tests=tests)
+          override_tests=(tests + amp_tests))
 
   requires_compile, _, compile_targets = \
       api.chromium_tests.analyze(
           affected_files,
           all_compile_targets(api, tests + tests_including_triggered),
           compile_targets,
           'trybot_analyze_config.json')
 
   if not requires_compile:
     return
 
   tests = tests_in_compile_targets(api, compile_targets, tests)
+  amp_tests = tests_in_compile_targets(api, compile_targets, amp_tests)
   tests_including_triggered = tests_in_compile_targets(
       api, compile_targets, tests_including_triggered)
 
   api.chromium_tests.compile_specific_targets(
       bot_config['mastername'],
       bot_config['buildername'],
       bot_update_step,
       master_dict,
       test_spec,
       compile_targets,
       tests_including_triggered,
       override_bot_type='builder_tester')
 
   if not tests:
     return
 
   api.chromium_tests.run_tests_and_deapply_as_needed(mastername, api, tests,
-                                                     bot_update_step)
+                                                     bot_update_step, amp_tests)
 
 
 def GenSteps(api):
   with api.tryserver.set_failure_hash():
     return _GenStepsInternal(api)
 
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text)
 
@@ skipping 502 matching lines @@
     )
 
   yield step_failure(mastername='tryserver.chromium.linux',
                      buildername='android_clang_dbg_recipe',
                      steps=['compile (with patch)'],
                      tryserver=True)
   yield step_failure(mastername='tryserver.chromium.linux',
                      buildername='android_clang_dbg_recipe',
                      steps=['compile (with patch)', 'compile (without patch)'],
                      tryserver=True)