Added swarming step to the Blink trybots

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.
 
 DEPS = [
   'bot_update',
   'chromium',
   'chromium_tests',
   'gclient',
   'isolate',
@@ skipping 539 matching lines @@
   return sorted(set(x
                     for test in tests
                     for x in test.compile_targets(api)))
 
 
 def find_test_named(test_name, tests):
   """Returns a list with all tests whose name matches |test_name|."""
   return [test for test in tests if test.name == test_name]
 
 
-def build_to_priority(build_properties):
-  """Returns the Swarming task priority for the build.
-
-  Does this by determining the build type. Lower is higher priority.
-  """
-  requester = build_properties.get('requester')
-  if requester == 'commit-bot@chromium.org':
-    # Commit queue job.
-    return 30
-  # Normal try job.
-  return 50
-
-
 def GenSteps(api):
   def swarming_shards_from_test_spec(test_spec, test_name):
     if isinstance(test_spec, dict):
       gtest_tests_spec = test_spec.get('gtest_tests', [])
     else:
       # TODO(phajdan.jr): Convert test step data and remove this.
       gtest_tests_spec = test_spec
 
     for test in gtest_tests_spec:
       if not isinstance(test, dict):
@@ skipping 269 matching lines @@
       api.isolate.find_isolated_tests(api.chromium.output_dir)
 
     if bot_config['compile_only']:
       tests = []
 
     return tests, bot_update_step
 
   mastername = api.properties.get('mastername')
   buildername = api.properties.get('buildername')
   bot_config = get_bot_config(mastername, buildername)
-  api.swarming.set_default_dimension('pool', 'Chrome')
-  api.swarming.default_priority = build_to_priority(api.properties)
-  api.swarming.add_default_tag('project:chromium')
-  api.swarming.add_default_tag('purpose:pre-commit')
-  api.swarming.default_idempotent = True
-
-  # Differentiate between try jobs and CQ jobs. Always find out who made the CL.
-  requestor = api.properties.get('requestor')
-  if requestor == 'commit-bot@chromium.org':
-    api.swarming.add_default_tag('purpose:CQ')
-    blamelist = api.properties.get('blamelist')
-    if len(blamelist) == 1:
-      requestor = blamelist[0]
-  else:
-    api.swarming.add_default_tag('purpose:ManualTS')
-  api.swarming.default_user = requestor
-
-  # TODO(phajdan): uncomment once we have XP or 10.6 trybots.
-  #os_dimension = bot_config.get('swarming_dimensions', {}).get('os')
-  #if os_dimension:
-  #  api.swarming.set_default_dimension('os', os_dimension)
+  api.chromium_tests.configure_swarming('chromium', precommit=True)
 
   main_waterfall_config = bot_config.get('based_on_main_waterfall')
   if main_waterfall_config:
     bot_update_step, master_dict, test_spec = \
         api.chromium_tests.sync_and_configure_build(
             main_waterfall_config['mastername'],
             main_waterfall_config['buildername'],
             override_bot_type='builder_tester',
             enable_swarming=True,
             chromium_apply_config=['trybot_flavor'])
@@ skipping 249 matching lines @@
         'chromium': {
           'exclusions': [],
         },
      })) +
     api.step_data('compile (with patch)', retcode=1) +
     api.step_data('compile (without patch)', retcode=1)
   )
 
   yield (
     api.test('arm') +
-    api.properties.generic(
-        mastername='tryserver.chromium.linux',
-        buildername='linux_arm',
-        requestor='commit-bot@chromium.org',
-        blamelist='joe@chromium.org',
-        blamelist_real=['joe@chromium.org']) +
+    props(buildername='linux_arm', requester='commit-bot@chromium.org',
+          blamelist='joe@chromium.org', blamelist_real=['joe@chromium.org']) +
     api.platform('linux', 64) +
     api.override_step_data('read test spec', api.json.output({
         'compile_targets': ['browser_tests_run'],
         'gtest_tests': [
           {
             'test': 'browser_tests',
             'args': '--gtest-filter: *NaCl*.*',
           }, {
             'test': 'base_tests',
             'args': ['--gtest-filter: *NaCl*.*'],
@@ skipping 53 matching lines @@
                 'filename': 'base/basictypes.h',
                 'license': 'UNKNOWN',
             },
         ]))
   )
 
   # Successfully compiling, isolating and running two targets on swarming for a
   # commit queue job.
   yield (
     api.test('swarming_basic_cq') +
-    props(buildername='linux_chromium_rel') +
+    props(requester='commit-bot@chromium.org', blamelist='joe@chromium.org',
+          blamelist_real=['joe@chromium.org']) +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {
@@ skipping 52 matching lines @@
         },
      })) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests', 'browser_tests']))
   )
 
   # One target (browser_tests) failed to produce *.isolated file.
   yield (
     api.test('swarming_missing_isolated') +
-    props(buildername='linux_chromium_rel') +
+    props(requester='commit-bot@chromium.org', blamelist='joe@chromium.org',
+          blamelist_real=['joe@chromium.org']) +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {'can_use_on_swarming_builders': True},
@@ skipping 11 matching lines @@
      })) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests']))
   )
 
   # One test (base_unittest) failed on swarming. It is retried with
   # deapplied patch.
   yield (
     api.test('swarming_deapply_patch') +
-    props(buildername='linux_chromium_rel') +
+    props(requester='commit-bot@chromium.org', blamelist='joe@chromium.org',
+          blamelist_real=['joe@chromium.org']) +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {'can_use_on_swarming_builders': True},
@@ skipping 194 matching lines @@
             'test': 'base_tests',
             'args': ['--gtest-filter: *NaCl*.*'],
           },
         ],
       })
     ) +
     api.override_step_data(
       'analyze',
       api.json.output({'invalid_targets': 'invalid target'}))
   )