Make android-chrome bisect work with archives.

tools/auto_bisect/bisect_perf_regression.py

 #!/usr/bin/env python
 # 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.
 
 """Chromium auto-bisect tool
 
 This script bisects a range of commits using binary search. It starts by getting
 reference values for the specified "good" and "bad" commits. Then, for revisions
 in between, it will get builds, run tests and classify intermediate revisions as
@@ skipping 107 matching lines @@
 
 # Git branch name used to run bisect try jobs.
 BISECT_TRYJOB_BRANCH = 'bisect-tryjob'
 # Git master branch name.
 BISECT_MASTER_BRANCH = 'master'
 # File to store 'git diff' content.
 BISECT_PATCH_FILE = 'deps_patch.txt'
 # SVN repo where the bisect try jobs are submitted.
 PERF_SVN_REPO_URL = 'svn://svn.chromium.org/chrome-try/try-perf'
 FULL_SVN_REPO_URL = 'svn://svn.chromium.org/chrome-try/try'
-
+ANDROID_CHROME_SVN_REPO_URL = ('svn://svn.chromium.org/chrome-try-internal/'
+                               'try-perf')
 
 class RunGitError(Exception):
 
   def __str__(self):
     return '%s\nError executing git command.' % self.args[0]
 
 
 def GetSHA1HexDigest(contents):
   """Returns SHA1 hex digest of the given string."""
   return hashlib.sha1(contents).hexdigest()
@@ skipping 49 matching lines @@
   # the DEPS file with the following format:
   # 'depot_name': 'revision',
   vars_body = re_results.group('vars_body')
   rxp = re.compile(r"'(?P<depot_body>[\w_-]+)':[\s]+'(?P<rev_body>[\w@]+)'",
                    re.MULTILINE)
   re_results = rxp.findall(vars_body)
 
   return dict(re_results)
 
 
-def _WaitUntilBuildIsReady(fetch_build_func, builder_name, builder_type,
-                           build_request_id, max_timeout):
+def _WaitUntilBuildIsReady(fetch_build_func, builder_name, build_request_id,
+                           max_timeout, buildbot_server_url):
   """Waits until build is produced by bisect builder on try server.
 
   Args:
     fetch_build_func: Function to check and download build from cloud storage.
     builder_name: Builder bot name on try server.
-    builder_type: Builder type, e.g. "perf" or "full". Refer to the constants
-        |fetch_build| which determine the valid values that can be passed.
     build_request_id: A unique ID of the build request posted to try server.
     max_timeout: Maximum time to wait for the build.
+    buildbot_server_url: Buildbot url to check build status.
 
   Returns:
      Downloaded archive file path if exists, otherwise None.
   """
   # Build number on the try server.
   build_num = None
   # Interval to check build on cloud storage.
   poll_interval = 60
   # Interval to check build status on try server in seconds.
   status_check_interval = 600
   last_status_check = time.time()
   start_time = time.time()
+
   while True:
     # Checks for build on gs://chrome-perf and download if exists.
     res = fetch_build_func()
     if res:
       return (res, 'Build successfully found')
     elapsed_status_check = time.time() - last_status_check
     # To avoid overloading try server with status check requests, we check
     # build status for every 10 minutes.
     if elapsed_status_check > status_check_interval:
       last_status_check = time.time()
       if not build_num:
         # Get the build number on try server for the current build.
         build_num = request_build.GetBuildNumFromBuilder(
-            build_request_id, builder_name, builder_type)
+            build_request_id, builder_name, buildbot_server_url)
       # Check the status of build using the build number.
       # Note: Build is treated as PENDING if build number is not found
       # on the the try server.
       build_status, status_link = request_build.GetBuildStatus(
-          build_num, builder_name, builder_type)
+          build_num, builder_name, buildbot_server_url)
       if build_status == request_build.FAILED:
         return (None, 'Failed to produce build, log: %s' % status_link)
     elapsed_time = time.time() - start_time
     if elapsed_time > max_timeout:
       return (None, 'Timed out: %ss without build' % max_timeout)
 
     logging.info('Time elapsed: %ss without build.', elapsed_time)
     time.sleep(poll_interval)
     # For some reason, mac bisect bots were not flushing stdout periodically.
     # As a result buildbot command is timed-out. Flush stdout on all platforms
@@ skipping 390 matching lines @@
     bisect_utils.RunGit(['checkout', '-f', BISECT_MASTER_BRANCH])
     bisect_utils.RunGit(['branch', '-D', BISECT_TRYJOB_BRANCH])
 
 
 def _TryJobSvnRepo(builder_type):
   """Returns an SVN repo to use for try jobs based on the builder type."""
   if builder_type == fetch_build.PERF_BUILDER:
     return PERF_SVN_REPO_URL
   if builder_type == fetch_build.FULL_BUILDER:
     return FULL_SVN_REPO_URL
+  if builder_type == fetch_build.ANDROID_CHROME_PERF_BUILDER:
+    return ANDROID_CHROME_SVN_REPO_URL
   raise NotImplementedError('Unknown builder type "%s".' % builder_type)
 
 
 class BisectPerformanceMetrics(object):
   """This class contains functionality to perform a bisection of a range of
   revisions to narrow down where performance regressions may have occurred.
 
   The main entry-point is the Run method.
   """
 
@@ skipping 147 matching lines @@
       revision: The git revision to download.
       depot: The name of a dependency repository. Should be in DEPOT_NAMES.
       build_type: Target build type, e.g. Release', 'Debug', 'Release_x64' etc.
       create_patch: Create a patch with any locally modified files.
 
     Returns:
       True if download succeeds, otherwise False.
     """
     patch = None
     patch_sha = None
-    if depot != 'chromium':
+    if depot not in ['chromium', 'android-chrome']:

[qyearsley, 2015/03/10 23:52:32]

Note: a tuple is used at
https://code.google.com/p/chromium/codesearch#chromium/src/tools/auto_bisect/....


This way is fine, but optionally you could switch to using a tuple to be
consistent with that line in that other module.

[prasadv, 2015/03/11 18:50:38]

Done.

       # Create a DEPS patch with new revision for dependency repository.
       self._CreateDEPSPatch(depot, revision)
       create_patch = True
 
     if create_patch:
       revision, patch = self._CreatePatch(revision)
 
     if patch:
       # Get the SHA of the DEPS changes patch.
       patch_sha = GetSHA1HexDigest(patch)
@@ skipping 24 matching lines @@
           the DEPS, if applicable.
       deps_patch_sha: The SHA1 hex digest of the above patch.
 
     Returns:
       File path of the downloaded file if successful, otherwise None.
     """
     bucket_name, remote_path = fetch_build.GetBucketAndRemotePath(
         revision, builder_type=self.opts.builder_type,
         target_arch=self.opts.target_arch,
         target_platform=self.opts.target_platform,
-        deps_patch_sha=deps_patch_sha)
+        deps_patch_sha=deps_patch_sha,
+        extra_src=self.opts.extra_src)
     output_dir = os.path.abspath(build_dir)
     fetch_build_func = lambda: fetch_build.FetchFromCloudStorage(
         bucket_name, remote_path, output_dir)
 
     is_available = fetch_build.BuildIsAvailable(bucket_name, remote_path)
     if is_available:
       return fetch_build_func()
 
     # When build archive doesn't exist, make a request and wait.
     return self._RequestBuildAndWait(
@@ skipping 28 matching lines @@
     # This ID is added to "Reason" property of the build.
     build_request_id = GetSHA1HexDigest(
         '%s-%s-%s' % (git_revision, deps_patch, time.time()))
 
     # Revert any changes to DEPS file.
     bisect_utils.CheckRunGit(['reset', '--hard', 'HEAD'], cwd=self.src_cwd)
 
     builder_name, build_timeout = fetch_build.GetBuilderNameAndBuildTime(
         builder_type=self.opts.builder_type,
         target_arch=self.opts.target_arch,
-        target_platform=self.opts.target_platform)
+        target_platform=self.opts.target_platform,
+        extra_src=self.opts.extra_src)
 
     try:
       _StartBuilderTryJob(self.opts.builder_type, git_revision, builder_name,
                           job_name=build_request_id, patch=deps_patch)
     except RunGitError as e:
       logging.warn('Failed to post builder try job for revision: [%s].\n'
                    'Error: %s', git_revision, e)
       return None
 
+    # Get the buildbot master url to monitor build status.
+    buildbot_server_url = fetch_build.GetBuildBotUrl(
+        builder_type=self.opts.builder_type,
+        target_arch=self.opts.target_arch,
+        target_platform=self.opts.target_platform,
+        extra_src=self.opts.extra_src)
+
     archive_filename, error_msg = _WaitUntilBuildIsReady(
-        fetch_build_func, builder_name, self.opts.builder_type,
-        build_request_id, build_timeout)
+        fetch_build_func, builder_name, build_request_id, build_timeout,
+        buildbot_server_url)
     if not archive_filename:
       logging.warn('%s [revision: %s]', error_msg, git_revision)
     return archive_filename
 
   def _UnzipAndMoveBuildProducts(self, downloaded_file, build_dir,
                                  build_type='Release'):
     """Unzips the build archive and moves it to the build output directory.
 
     The build output directory is wherever the binaries are expected to
     be in order to start Chrome and run tests.
@@ skipping 65 matching lines @@
     if bisect_utils.IsWindowsHost():
       return 'full-build-win32'
     if bisect_utils.IsLinuxHost():
       return 'full-build-linux'
     if bisect_utils.IsMacHost():
       return 'full-build-mac'
     raise NotImplementedError('Unknown platform "%s".' % sys.platform)
 
   def IsDownloadable(self, depot):
     """Checks if build can be downloaded based on target platform and depot."""
-    if (self.opts.target_platform in ['chromium', 'android']
+    if (self.opts.target_platform in ['chromium', 'android', 'android-chrome']
         and self.opts.builder_type):
-      return (depot == 'chromium' or
+      # Incase of android-chrome platform, download archives only for

[qyearsley, 2015/03/10 23:52:32]

Incase -> In case

[prasadv, 2015/03/11 18:50:38]

Done.

+      # for android-chrome depot, for other depots such as chromium, v8, skia

[qyearsley, 2015/03/10 23:52:32]

The first "for" can be removed (it's already on the line above).
Also, I'd use a semicolon or period to separate "...for android-chrome depot"
and "for other depots...".

[prasadv, 2015/03/11 18:50:38]

Done.

+      # etc build the binary locally.

[qyearsley, 2015/03/10 23:52:32]

"etc" -> "etc.,"

[prasadv, 2015/03/11 18:50:38]

Done.

+      if self.opts.target_platform == 'android-chrome':
+          return depot == 'android-chrome'

[qyearsley, 2015/03/10 23:52:32]

Indentation should be two spaces.

[prasadv, 2015/03/11 18:50:38]

Done.

+      else:
+        return (depot == 'chromium' or
               'chromium' in bisect_utils.DEPOT_DEPS_NAME[depot]['from'] or
               'v8' in bisect_utils.DEPOT_DEPS_NAME[depot]['from'])
     return False
 
   def UpdateDepsContents(self, deps_contents, depot, git_revision, deps_key):
     """Returns modified version of DEPS file contents.
 
     Args:
       deps_contents: DEPS file content.
       depot: Current depot being bisected.
@@ skipping 1802 matching lines @@
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Runtime Error: %s' % e
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())