Added swarming step to the Blink trybots

scripts/slave/recipes/blink_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',
   'json',
   'path',
   'platform',
   'properties',
   'python',
   'raw_io',
   'rietveld',
   'step',
+  'swarming',
   'test_utils',
 ]
 
 
 BUILDERS = {
   'tryserver.blink': {
     'builders': {
       'linux_blink_dbg': {
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
@@ skipping 237 matching lines @@
   webkit_lint = api.path['build'].join('scripts', 'slave', 'chromium',
                                        'lint_test_files_wrapper.py')
   webkit_python_tests = api.path['build'].join('scripts', 'slave', 'chromium',
                                                'test_webkitpy_wrapper.py')
 
   # Set patch_root used when applying the patch after checkout. Default None
   # makes bot_update determine the patch_root from tryserver root, e.g. 'src'.
   bot_update_step = api.bot_update.ensure_checkout(
       force=True, patch_root=bot_config.get('root_override'))
 
+  if bot_config['compile_only']:
+    api.chromium.runhooks()
+    api.chromium.compile()
+    return
+
+  api.chromium_tests.configure_swarming('blink', precommit=True)
+
+  # Swarming uses Isolate to transfer files to swarming bots.
+  # set_isolate_environment modifies GYP_DEFINES to enable test isolation.
+  api.isolate.set_isolate_environment(api.chromium.c)
+
+  # Ensure swarming_client is compatible with what recipes expect.
+  api.swarming.check_client_version()
+
   api.chromium.runhooks()
+
+  api.isolate.clean_isolated_files(api.chromium.output_dir)
   api.chromium.compile()
+  api.isolate.find_isolated_tests(api.chromium.output_dir)
 
-  if not bot_config['compile_only']:
-    api.python('webkit_lint', webkit_lint, [
-      '--build-dir', api.path['checkout'].join('out'),
-      '--target', api.chromium.c.BUILD_CONFIG
-    ])
-    api.python('webkit_python_tests', webkit_python_tests, [
-      '--build-dir', api.path['checkout'].join('out'),
-      '--target', api.chromium.c.BUILD_CONFIG,
-    ])
+  api.python('webkit_lint', webkit_lint, [
+    '--build-dir', api.path['checkout'].join('out'),
+    '--target', api.chromium.c.BUILD_CONFIG
+  ])
+  api.python('webkit_python_tests', webkit_python_tests, [
+    '--build-dir', api.path['checkout'].join('out'),
+    '--target', api.chromium.c.BUILD_CONFIG,
+  ])
 
-    # TODO(martiniss) this is pretty goofy
-    failed = False
-    exception = Exception() # So that pylint doesn't complain
-    try:
-      api.chromium.runtest('webkit_unit_tests', xvfb=True)
-    except api.step.StepFailure as f:
-      failed = True
-      exception = f
+  # TODO(martiniss) this is pretty goofy
+  failed = False
+  exception = Exception() # So that pylint doesn't complain
+  try:
+    api.chromium.runtest('webkit_unit_tests', xvfb=True)
+  except api.step.StepFailure as f:
+    failed = True
+    exception = f
 
-    try:
-      api.chromium.runtest('blink_platform_unittests')
-    except api.step.StepFailure as f:
-      failed = True
-      exception = f
+  try:
+    api.chromium.runtest('blink_platform_unittests')
+  except api.step.StepFailure as f:
+    failed = True
+    exception = f
 
-    try:
-      api.chromium.runtest('blink_heap_unittests')
-    except api.step.StepFailure as f:
-      failed = True
-      exception = f
+  try:
+    api.chromium.runtest('blink_heap_unittests')
+  except api.step.StepFailure as f:
+    failed = True
+    exception = f
 
-    try:
-      api.chromium.runtest('wtf_unittests')
-    except api.step.StepFailure as f:
-      failed = True
-      exception = f
+  try:
+    api.chromium.runtest('wtf_unittests')
+  except api.step.StepFailure as f:
+    failed = True
+    exception = f
 
-    if failed:
-      api.python.inline(
-        'Aborting due to failed build state',
-        "import sys; sys.exit(1)")
-      raise exception
+  if failed:
+    api.python.inline(
+      'Aborting due to failed build state',
+      "import sys; sys.exit(1)")
+    raise exception
 
-  if not bot_config['compile_only']:
-    def deapply_patch_fn(_failing_steps):
-      bot_update_json = bot_update_step.json.output
-      api.gclient.c.revisions['src'] = str(
-          bot_update_json['properties']['got_revision'])
-      api.gclient.c.revisions['src/third_party/WebKit'] = str(
-          bot_update_json['properties']['got_webkit_revision'])
+  def deapply_patch_fn(_failing_steps):
+    bot_update_json = bot_update_step.json.output
+    api.gclient.c.revisions['src'] = str(
+        bot_update_json['properties']['got_revision'])
+    api.gclient.c.revisions['src/third_party/WebKit'] = str(
+        bot_update_json['properties']['got_webkit_revision'])
 
-      api.bot_update.ensure_checkout(patch=False, force=True)
-      api.chromium.runhooks()
-      api.chromium.compile()
+    api.bot_update.ensure_checkout(patch=False, force=True)
+    api.chromium.runhooks()
+    api.isolate.clean_isolated_files(api.chromium.output_dir)
+    api.chromium.compile()
+    api.isolate.find_isolated_tests(api.chromium.output_dir)
 
-    api.test_utils.determine_new_failures(
-        api, [api.chromium.steps.BlinkTest(api)], deapply_patch_fn)
+  api.test_utils.determine_new_failures(
+      api, [api.chromium.steps.BlinkTest(api)], deapply_patch_fn)
 
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text)
 
 
 def GenTests(api):
   canned_test = api.json.canned_test_output
   with_patch = 'webkit_tests (with patch)'
   without_patch = 'webkit_tests (without patch)'
@@ skipping 17 matching lines @@
             api.test(test_name + ('_pass' if pass_first else '_fail')) +
             api.step_data(with_patch, canned_test(passing=pass_first))
           )
           if not pass_first:
             test += api.step_data(
                 without_patch, canned_test(passing=False, minimal=True))
           tests.append(test)
 
       for test in tests:
         test += (
-          properties(mastername, buildername) +
+          properties(mastername, buildername,
+                     blamelist_real=['someone@chromium.org']) +

[Ken Russell (switch to Gerrit), 2014/10/29 19:16:16]

Is this really necessary for code coverage? It causes a lot of spurious test
expectation changes.

[Sergiy Byelozyorov, 2014/10/29 20:04:24]

It's either that or adding another test with a single reviewer in blamelist
(covers line 490 in chromium_tests/api.py). Adding more tests is always bad,
because it forces everyone review yet another test after changes. Having two
reviewers doesn't really cover any functionality.

           api.platform(bot_config['testing']['platform'],
                        bot_config.get(
                            'chromium_config_kwargs', {}).get('TARGET_BITS', 64))
         )
 
         yield test
 
   # This tests that if the first fails, but the second pass succeeds
   # that we fail the whole build.
   yield (
@@ skipping 49 matching lines @@
   # and compare the lists of failing tests).
   yield (
     api.test('too_many_failures_for_retcode') +
     properties('tryserver.blink', 'linux_blink_rel') +
     api.override_step_data(with_patch,
                            canned_test(passing=False,
                                        num_additional_failures=125)) +
     api.override_step_data(without_patch,
                            canned_test(passing=True, minimal=True))
   )
+
+  yield (
+    api.test('non_cq_tryjob') +
+    properties('tryserver.blink', 'win_blink_rel',
+               requester='someone@chromium.org') +
+    api.step_data(with_patch, canned_test(passing=True))
+  )