Add builder_type to fetch builds for android-chrome.

tools/auto_bisect/fetch_build.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.
 
 """This module contains functions for fetching and extracting archived builds.
 
 The builds may be stored in different places by different types of builders;
 for example, builders on tryserver.chromium.perf stores builds in one place,
 while builders on chromium.linux store builds in another.
 
@@ skipping 12 matching lines @@
 import zipfile
 
 # Telemetry (src/tools/telemetry) is expected to be in the PYTHONPATH.
 from telemetry.util import cloud_storage
 
 import bisect_utils
 
 # Possible builder types.
 PERF_BUILDER = 'perf'
 FULL_BUILDER = 'full'
+ANDROID_CHROME_PERF_BUILDER = 'android-chrome-perf'
 
 
 def GetBucketAndRemotePath(revision, builder_type=PERF_BUILDER,
                            target_arch='ia32', target_platform='chromium',
-                           deps_patch_sha=None):
+                           deps_patch_sha=None, extra_src=None):
   """Returns the location where a build archive is expected to be.
 
   Args:
     revision: Revision string, e.g. a git commit hash or SVN revision.
     builder_type: Type of build archive.
     target_arch: Architecture, e.g. "ia32".
     target_platform: Platform name, e.g. "chromium" or "android".
     deps_patch_sha: SHA1 hash which identifies a particular combination of
         custom revisions for dependency repositories.
+    extra_src: Path to a script which can be used to modify the bisect script's
+        behavior.
 
   Returns:
     A pair of strings (bucket, path), where the archive is expected to be.
   """
   build_archive = BuildArchive.Create(
-      builder_type, target_arch=target_arch, target_platform=target_platform)
+      builder_type, target_arch=target_arch, target_platform=target_platform,
+      extra_src=extra_src)
   bucket = build_archive.BucketName()
   remote_path = build_archive.FilePath(revision, deps_patch_sha=deps_patch_sha)
   return bucket, remote_path
 
 
 class BuildArchive(object):
   """Represents a place where builds of some type are stored.
 
   There are two pieces of information required to locate a file in Google
   Cloud Storage, bucket name and file path. Subclasses of this class contain
   specific logic about which bucket names and paths should be used to fetch
   a build.
   """
 
   @staticmethod
-  def Create(builder_type, target_arch='ia32', target_platform='chromium'):
+  def Create(builder_type, target_arch='ia32', target_platform='chromium',
+        extra_src=None):
     if builder_type == PERF_BUILDER:
       return PerfBuildArchive(target_arch, target_platform)
     if builder_type == FULL_BUILDER:
       return FullBuildArchive(target_arch, target_platform)
+    if builder_type == ANDROID_CHROME_PERF_BUILDER:
+      try:
+        extra_src = bisect_utils.LoadExtraSrc(extra_src)

[RobertoCN, 2015/01/21 23:15:19]

I think it would be more readable if we used an additional name here:
(Note that I have no idea what LoadExtraSrc does)

loaded_extra_src = bisect_utils.LoadExtraSrc(extra_src)
return AndroidChromeBuildArchive(
    target_arch, target_platform, loaded_extra_src)

[prasadv, 2015/01/23 18:05:57]

Done.

+        return AndroidChromeBuildArchive(
+            target_arch, target_platform, extra_src)
+      except (IOError, TypeError, ImportError):
+        raise RuntimeError('Invalid or missing --extra_src.')

[qyearsley, 2015/01/26 17:50:32]

[Optional] In the case of a failure, it may be useful to also include the value
of extra_src passed in, and maybe the error that was raised.

[prasadv, 2015/01/26 18:58:26]

Done.

     raise NotImplementedError('Builder type "%s" not supported.' % builder_type)
 
-  def __init__(self, target_arch='ia32', target_platform='chromium'):
+  def __init__(self, target_arch='ia32', target_platform='chromium',
+               extra_src=None):
+    self._extra_src = extra_src
     if bisect_utils.IsLinuxHost() and target_platform == 'android':
       self._platform = 'android'
     elif bisect_utils.IsLinuxHost():
       self._platform = 'linux'
     elif bisect_utils.IsMacHost():
       self._platform = 'mac'
     elif bisect_utils.Is64BitWindows() and target_arch == 'x64':
       self._platform = 'win64'
     elif bisect_utils.IsWindowsHost():
       self._platform = 'win'
@@ skipping 94 matching lines @@
         'android': 'android_main_rel',
         'linux': 'chromium.linux/Linux Builder',
         'mac': 'chromium.mac/Mac Builder',
         'win64': 'chromium.win/Win x64 Builder',
         'win': 'chromium.win/Win Builder',
     }
     assert self._platform in platform_to_directory
     return platform_to_directory.get(self._platform)
 
 
+class AndroidChromeBuildArchive(BuildArchive):

[qyearsley, 2015/01/26 17:50:32]

[Optional] It can be seen from the code below, but you could also explicitly say
here what needs to be in the extra source module that is imported, e.g.:

If AndroidChromeBuildArchive is used, it is assumed that the --extra_src is a
valid Python module which contains the module-level functions GetBucketName and
GetArchiveDirectory.

You can also note that this is necessary because this code could include 
internal-only names.

[prasadv, 2015/01/26 18:58:26]

Done.

+
+  def BucketName(self):
+    return self._extra_src.GetBucketName()
+
+  def _ZipFileName(self, revision, deps_patch_sha=None):
+    """Gets the file name of a zip archive on android-chrome.
+
+    This returns a file name of the form build_product_<revision>.zip,
+    which is a format used by android-chrome.
+
+    Args:
+      revision: A git commit hash or other revision string.
+      deps_patch_sha: SHA1 hash of a DEPS file patch.
+
+    Returns:
+      The archive file name.
+    """
+    if deps_patch_sha:
+      revision = '%s_%s' % (revision, deps_patch_sha)
+    return 'build_product_%s.zip' % revision
+
+  def FilePath(self, revision, deps_patch_sha=None):
+    return '%s/%s' % (self._ArchiveDirectory(),
+                      self._ZipFileName(revision, deps_patch_sha))
+
+  def _ArchiveDirectory(self):
+    """Returns the directory name to download builds from."""
+    return self._extra_src.GetArchiveDirectory()
+
+
 def BuildIsAvailable(bucket_name, remote_path):
   """Checks whether a build is currently archived at some place."""
   logging.info('Checking existance: gs://%s/%s' % (bucket_name, remote_path))
   try:
     exists = cloud_storage.Exists(bucket_name, remote_path)
     logging.info('Exists? %s' % exists)
     return exists
   except cloud_storage.CloudStorageError:
     return False
 
@@ skipping 155 matching lines @@
     return 1
 
   FetchFromCloudStorage(bucket_name, remote_path, args.output_dir)
   print 'Build has been downloaded to and extracted in %s.' % args.output_dir
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))