Remove expensive workarounds for infra flakes from blink_trybot

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',
   'gclient',
   'json',
   'path',
@@ skipping 350 matching lines @@
   api.step.auto_resolve_conflicts = True
 
   if 'oilpan' in buildername:
     api.chromium.apply_config('oilpan')
 
   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')
 
-  root = bot_config.get('root_override', api.rietveld.calculate_issue_root())
-
-  yield api.bot_update.ensure_checkout()
-  # The first time we run bot update, remember if bot_update mode is on or off.
-  bot_update_mode = api.step_history.last_step().json.output['did_run']
-  if not bot_update_mode:
-    yield api.gclient.checkout(
-        revert=True, can_fail_build=False, abort_on_failure=False)
-    for step in api.step_history.values():
-      if step.retcode != 0:
-        # TODO(phajdan.jr): Remove the workaround, http://crbug.com/357767 .
-        yield (
-          api.path.rmcontents('slave build directory', api.path['slave_build']),
-          api.gclient.checkout(),
-        )
-        break
-    yield api.rietveld.apply_issue(root)
-
+  yield api.bot_update.ensure_checkout(force=True)
   yield (
     api.chromium.runhooks(),
-    api.chromium.compile(abort_on_failure=False, can_fail_build=False),
+    api.chromium.compile(),
   )
 
-  if api.step_history['compile'].retcode != 0:
-    # TODO(phajdan.jr): Remove the workaround, http://crbug.com/357767 .
-    if api.platform.is_win:
-      yield api.chromium.taskkill()
-    yield api.path.rmcontents('slave build directory', api.path['slave_build'])
-    if bot_update_mode:
-      yield api.bot_update.ensure_checkout()
-    else:
-      yield (
-        api.gclient.checkout(revert=False),
-        api.rietveld.apply_issue(root),
-      )
-    yield (
-      api.chromium.runhooks(),
-      api.chromium.compile(),
-    )
-
   if not bot_config['compile_only']:
     yield (
       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.chromium.runtest('webkit_unit_tests', xvfb=True),
       api.chromium.runtest('blink_platform_unittests'),
       api.chromium.runtest('blink_heap_unittests'),
       api.chromium.runtest('wtf_unittests'),
     )
 
   if not bot_config['compile_only']:
     def deapply_patch_fn(_failing_steps):
-      if bot_update_mode:
-        yield api.bot_update.ensure_checkout(patch=False, always_run=True)
-      else:
-        yield api.gclient.checkout(revert=True, always_run=True)
+      yield api.bot_update.ensure_checkout(patch=False, always_run=True)
 
       yield (
         api.chromium.runhooks(always_run=True),
         api.chromium.compile(always_run=True),
       )
 
     yield api.test_utils.determine_new_failures([BlinkTest()], deapply_patch_fn)
 
 
 def _sanitize_nonalpha(text):
@@ skipping 43 matching lines @@
   # that we fail the whole build.
   yield (
     api.test('minimal_pass_continues') +
     properties('tryserver.blink', 'linux_blink_rel') +
     api.override_step_data(with_patch, canned_test(passing=False)) +
     api.override_step_data(without_patch,
                            canned_test(passing=True, minimal=True))
   )
 
   yield (
-    api.test('gclient_revert_nuke') +
-    properties('tryserver.blink', 'linux_blink_no_bot_update') +
-    api.step_data('gclient revert', retcode=1) +
-    api.override_step_data(with_patch, canned_test(passing=True, minimal=True))
-  )
-
-  yield (
     api.test('preamble_test_failure') +
     properties('tryserver.blink', 'linux_blink_rel') +
     api.step_data('webkit_unit_tests', retcode=1)
   )
 
   # This tests what happens if something goes horribly wrong in
   # run-webkit-tests and we return an internal error; the step should
   # be considered a hard failure and we shouldn't try to compare the
   # lists of failing tests.
   # 255 == test_run_results.UNEXPECTED_ERROR_EXIT_STATUS in run-webkit-tests.
@@ skipping 38 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))
   )