Trigger build request using git try instead of try_job_http on bisect bots

tools/auto_bisect/bisect_utils.py

 # Copyright 2014 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.
 
 """Utility functions used by the bisect tool.
 
 This includes functions related to checking out the depot and outputting
 annotations for the Buildbot waterfall.
 """
 
 import errno
 import imp
 import os
-import shutil
 import stat
 import subprocess
 import sys
 
 DEFAULT_GCLIENT_CUSTOM_DEPS = {
     'src/data/page_cycler': 'https://chrome-internal.googlesource.com/'
                             'chrome/data/page_cycler/.git',
     'src/data/dom_perf': 'https://chrome-internal.googlesource.com/'
                          'chrome/data/dom_perf/.git',
     'src/data/mach_ports': 'https://chrome-internal.googlesource.com/'
@@ skipping 51 matching lines @@
 CROS_SCRIPT_KEY_PATH = os.path.join(
     '..', 'cros', 'src', 'scripts', 'mod_for_test_scripts', 'ssh_keys',
     'testing_rsa')
 
 REPO_PARAMS = [
     'https://chrome-internal.googlesource.com/chromeos/manifest-internal/',
     '--repo-url',
     'https://git.chromium.org/external/repo.git'
 ]
 
+# Bisect working directory.
+BISECT_DIR = 'bisect'
+
 
 def OutputAnnotationStepStart(name):
   """Outputs annotation to signal the start of a step to a try bot.
 
   Args:
     name: The name of the step.
   """
   print
   print '@@@SEED_STEP %s@@@' % name
   print '@@@STEP_CURSOR %s@@@' % name
@@ skipping 59 matching lines @@
 
   Args:
     working_directory: The directory to create the new 'bisect' directory in.
 
   Returns:
     True if the directory was successfully created (or already existed).
   """
   cwd = os.getcwd()
   os.chdir(working_directory)
   try:
-    os.mkdir('bisect')
+    os.mkdir(BISECT_DIR)
   except OSError, e:
     if e.errno != errno.EEXIST:  # EEXIST indicates that it already exists.
       os.chdir(cwd)
       return False
-  os.chdir('bisect')
+  os.chdir(BISECT_DIR)
   return True
 
 
 def _SubprocessCall(cmd, cwd=None):
   """Runs a command in a subprocess.
 
   Args:
     cmd: The command to run.
     cwd: Working directory to run from.
 
@@ skipping 120 matching lines @@
     path: The path name passed to func.
     _: Exception information from sys.exc_info(). Not used.
   """
   if not os.access(path, os.W_OK):
     os.chmod(path, stat.S_IWUSR)
     func(path)
   else:
     raise
 
 
-def RemoveThirdPartyDirectory(dir_name):
-  """Removes third_party directory from the source.
-
-  At some point, some of the third_parties were causing issues to changes in
-  the way they are synced. We remove such folder in order to avoid sync errors
-  while bisecting.
-
-  Returns:
-    True on success, otherwise False.
-  """
-  path_to_dir = os.path.join(os.getcwd(), 'third_party', dir_name)
-  try:
-    if os.path.exists(path_to_dir):
-      shutil.rmtree(path_to_dir, onerror=OnAccessError)
-  except OSError, e:
-    print 'Error #%d while running shutil.rmtree(%s): %s' % (
-        e.errno, path_to_dir, str(e))
-    if e.errno != errno.ENOENT:
-      return False
-  return True
-
-
 def _CleanupPreviousGitRuns():
   """Cleans up any leftover index.lock files after running git."""
   # If a previous run of git crashed, or bot was reset, etc., then we might
   # end up with leftover index.lock files.
   for path, _, files in os.walk(os.getcwd()):
     for cur_file in files:
       if cur_file.endswith('index.lock'):
         path_to_file = os.path.join(path, cur_file)
         os.remove(path_to_file)
 
 
 def RunGClientAndSync(cwd=None):
   """Runs gclient and does a normal sync.
 
   Args:
     cwd: Working directory to run from.
 
   Returns:
     The return code of the call.
   """
-  params = ['sync', '--verbose', '--nohooks', '--reset', '--force']
+  params = ['sync', '--verbose', '--nohooks', '--reset', '--force',
+            '--delete_unversioned_trees']
   return RunGClient(params, cwd=cwd)
 
 
 def SetupGitDepot(opts, custom_deps):
   """Sets up the depot for the bisection.
 
   The depot will be located in a subdirectory called 'bisect'.
 
   Args:
     opts: The options parsed from the command line through parse_args().
     custom_deps: A dictionary of additional dependencies to add to .gclient.
 
   Returns:
     True if gclient successfully created the config file and did a sync, False
     otherwise.
   """
   name = 'Setting up Bisection Depot'
+  try:
+    if opts.output_buildbot_annotations:
+      OutputAnnotationStepStart(name)
 
-  if opts.output_buildbot_annotations:
-    OutputAnnotationStepStart(name)
+    if RunGClientAndCreateConfig(opts, custom_deps):
+      return False
 
-  passed = False
-
-  if not RunGClientAndCreateConfig(opts, custom_deps):
-    passed_deps_check = True
-    if os.path.isfile(os.path.join('src', FILE_DEPS_GIT)):
-      cwd = os.getcwd()
-      os.chdir('src')
-      if passed_deps_check:
-        passed_deps_check = RemoveThirdPartyDirectory('libjingle')
-      if passed_deps_check:
-        passed_deps_check = RemoveThirdPartyDirectory('skia')
-      os.chdir(cwd)
-
-    if passed_deps_check:
-      _CleanupPreviousGitRuns()
-
-      RunGClient(['revert'])
-      if not RunGClientAndSync():
-        passed = True
-
-  if opts.output_buildbot_annotations:
-    print
-    OutputAnnotationStepClosed()
-
-  return passed
+    _CleanupPreviousGitRuns()
+    RunGClient(['revert'])
+    return not RunGClientAndSync()
+  finally:
+    if opts.output_buildbot_annotations:
+      OutputAnnotationStepClosed()
 
 
 def CheckIfBisectDepotExists(opts):
   """Checks if the bisect directory already exists.
 
   Args:
     opts: The options parsed from the command line through parse_args().
 
   Returns:
     Returns True if it exists.
   """
-  path_to_dir = os.path.join(opts.working_directory, 'bisect', 'src')
+  path_to_dir = os.path.join(opts.working_directory, BISECT_DIR, 'src')
   return os.path.exists(path_to_dir)
 
 
 def CheckRunGit(command, cwd=None):
   """Run a git subcommand, returning its output and return code. Asserts if
   the return code of the call is non-zero.
 
   Args:
     command: A list containing the args to git.
 
@@ skipping 22 matching lines @@
 
 
 def CreateBisectDirectoryAndSetupDepot(opts, custom_deps):
   """Sets up a subdirectory 'bisect' and then retrieves a copy of the depot
   there using gclient.
 
   Args:
     opts: The options parsed from the command line through parse_args().
     custom_deps: A dictionary of additional dependencies to add to .gclient.
   """
+  if CheckIfBisectDepotExists(opts):
+    path_to_dir = os.path.join(os.path.abspath(opts.working_directory),
+                               BISECT_DIR, 'src')
+    (output, _) = RunGit(['rev-parse', '--is-inside-work-tree'],
+                         cwd=path_to_dir)
+    if output.strip() == 'true':
+      # Checks out the master branch, throws an exception if git command fails.
+      CheckRunGit(['checkout', '-f', 'master'], cwd=path_to_dir)
+
   if not _CreateAndChangeToSourceDirectory(opts.working_directory):
     raise RuntimeError('Could not create bisect directory.')
 
   if not SetupGitDepot(opts, custom_deps):
     raise RuntimeError('Failed to grab source.')
 
 
 def RunProcess(command):
   """Runs an arbitrary command.
 
@@ skipping 71 matching lines @@
     platform = os.environ.get('PROCESSOR_ARCHITECTURE')
   return platform and platform in ['AMD64', 'I64']
 
 
 def IsLinuxHost():
   return sys.platform.startswith('linux')
 
 
 def IsMacHost():
   return sys.platform.startswith('darwin')