Update the update_reference_builds script.

tools/update_reference_build.py

Index: tools/update_reference_build.py
diff --git a/tools/update_reference_build.py b/tools/update_reference_build.py
index 8224cd64fee0f35c56e04511d40421c8a47815d7..5104f3b68bd626ee184e9dae70e252dd1bdd8142 100755
--- a/tools/update_reference_build.py
+++ b/tools/update_reference_build.py
@@ -6,12 +6,8 @@
 
 """Updates the Chrome reference builds.
 
-To update Chromium (unofficial) reference build, use the -r option and give a
-Chromium SVN revision number, like 228977. To update a Chrome (official) build,
-use the -v option and give a Chrome version number like 30.0.1595.0.
-
-If you're getting a Chrome build, you can give the flag --gs to fetch from
-Google Storage. Otherwise, it will be fetched from go/chrome_official_builds.
+To update a Chrome (official) build, use the -v option and give a Chrome
+version number like 30.0.1595.0.
 
 Before running this script, you should first verify that you are authenticated
 for SVN. You can do this by running:

[qyearsley, 2014/08/22 22:06:15]

Will this work after flag day when Chromium SVN repo is frozen?

[tonyg, 2014/08/22 22:18:53]

I'm not sure about that. I'll probably get rid of the SVN from this file in
another change.

@@ -20,7 +16,7 @@ You may need to get your SVN password from https://chromium-access.appspot.com/.
 
 Usage:
   $ cd /tmp
-  $ /path/to/update_reference_build.py --gs -v <version>
+  $ /path/to/update_reference_build.py -v <version>
   $ cd reference_builds/reference_builds
   $ gcl change
   $ gcl upload <change>
@@ -38,62 +34,33 @@ import urllib
 import urllib2
 import zipfile
 
-# Example chromium build location:
-# gs://chromium-browser-snapshots/Linux/228977/chrome-linux.zip
-CHROMIUM_URL_FMT = ('http://commondatastorage.googleapis.com/'
-                    'chromium-browser-snapshots/%s/%s/%s')
-
-# Chrome official build storage
-# https://wiki.corp.google.com/twiki/bin/view/Main/ChromeOfficialBuilds
-
-# Internal Google archive of official Chrome builds, example:
-# https://goto.google.com/chrome_official_builds/
-# 32.0.1677.0/precise32bit/chrome-precise32bit.zip
-CHROME_INTERNAL_URL_FMT = ('http://master.chrome.corp.google.com/'
-                           'official_builds/%s/%s/%s')
 
 # Google storage location (no public web URL's), example:
-# gs://chrome-archive/30/30.0.1595.0/precise32bit/chrome-precise32bit.zip
-CHROME_GS_URL_FMT = ('gs://chrome-archive/%s/%s/%s/%s')
+# gs://chrome-unsigned/desktop-*/30.0.1595.0/precise32/chrome-precise32.zip
+CHROME_GS_URL_FMT = ('gs://chrome-unsigned/desktop-*/%s/%s/%s')
 
 
 class BuildUpdater(object):
-  _PLATFORM_FILES_MAP = {
-      'Win': [
-          'chrome-win32.zip',
-          'chrome-win32-syms.zip',
-      ],
-      'Mac': [
-          'chrome-mac.zip',
-      ],
-      'Linux': [
-          'chrome-linux.zip',
-      ],
-      'Linux_x64': [
-          'chrome-linux.zip',
-      ],
-  }
-
   _CHROME_PLATFORM_FILES_MAP = {
       'Win': [
-          'chrome-win32.zip',
+          'chrome-win.zip',
           'chrome-win32-syms.zip',
       ],
       'Mac': [
           'chrome-mac.zip',
       ],
       'Linux': [
-          'chrome-precise32bit.zip',
+          'chrome-precise32.zip',
       ],
       'Linux_x64': [
-          'chrome-precise64bit.zip',
+          'chrome-precise64.zip',
       ],
   }
 
   # Map of platform names to gs:// Chrome build names.
   _BUILD_PLATFORM_MAP = {
-      'Linux': 'precise32bit',
-      'Linux_x64': 'precise64bit',
+      'Linux': 'precise32',
+      'Linux_x64': 'precise64',
       'Win': 'win',
       'Mac': 'mac',
   }
@@ -107,9 +74,7 @@ class BuildUpdater(object):
 
   def __init__(self, options):
     self._platforms = options.platforms.split(',')
-    self._version_or_revision = options.version or int(options.revision)
-    self._use_official_version = bool(options.version)
-    self._use_gs = options.use_gs
+    self._version = options.version
 
   @staticmethod
   def _GetCmdStatusAndOutput(args, cwd=None, shell=False):
@@ -134,63 +99,34 @@ class BuildUpdater(object):
     logging.info(stdout)
     return (exit_code, stdout)
 
-  def _GetBuildUrl(self, platform, version_or_revision, filename):
+  def _GetBuildUrl(self, platform, version, filename):
     """Returns the URL for fetching one file.
 
     Args:
       platform: Platform name, must be a key in |self._BUILD_PLATFORM_MAP|.
-      version_or_revision: Either an SVN revision, e.g. 234567, or a Chrome
-          version number, e.g. 30.0.1600.1.
+      version: A Chrome version number, e.g. 30.0.1600.1.
       filename: Name of the file to fetch.
 
     Returns:
       The URL for fetching a file. This may be a GS or HTTP URL.
     """
-    if self._use_official_version:
-      # Chrome Google storage bucket.
-      version = version_or_revision
-      if self._use_gs:
-        release = version[:version.find('.')]
-        return (CHROME_GS_URL_FMT % (
-            release,
-            version,
-            self._BUILD_PLATFORM_MAP[platform],
-            filename))
-      # Chrome internal archive.
-      return (CHROME_INTERNAL_URL_FMT % (
-          version,
-          self._BUILD_PLATFORM_MAP[platform],
-          filename))
-    # Chromium archive.
-    revision = version_or_revision
-    return CHROMIUM_URL_FMT % (urllib.quote_plus(platform), revision, filename)
-
-  def _FindBuildVersionOrRevision(
-      self, platform, version_or_revision, filename):
-    """Searches for a version or revision where a filename can be found.
+    return CHROME_GS_URL_FMT % (
+        version, self._BUILD_PLATFORM_MAP[platform], filename)
+
+  def _FindBuildVersion(self, platform, version, filename):
+    """Searches for a version where a filename can be found.
 
     Args:
       platform: Platform name.
-      version_or_revision: Either Chrome version or Chromium revision.
+      version: A Chrome version number, e.g. 30.0.1600.1.
       filename: Filename to look for.
 
     Returns:
-      A version or revision where the file could be found, or None.
+      A version where the file could be found, or None.
     """
     # TODO(shadi): Iterate over official versions to find a valid one.
-    if self._use_official_version:
-      version = version_or_revision
-      return (version
-              if self._DoesBuildExist(platform, version, filename) else None)
-
-    revision = version_or_revision
-    MAX_REVISIONS_PER_BUILD = 100
-    for revision_guess in xrange(revision, revision + MAX_REVISIONS_PER_BUILD):
-      if self._DoesBuildExist(platform, revision_guess, filename):
-        return revision_guess
-      else:
-        time.sleep(.1)
-    return None
+    return (version
+            if self._DoesBuildExist(platform, version, filename) else None)
 
   def _DoesBuildExist(self, platform, version, filename):
     """Checks whether a file can be found for the given Chrome version.
@@ -204,17 +140,7 @@ class BuildUpdater(object):
       True if the file could be found, False otherwise.
     """
     url = self._GetBuildUrl(platform, version, filename)
-    if self._use_gs:
-      return self._DoesGSFileExist(url)
-
-    request = urllib2.Request(url)
-    request.get_method = lambda: 'HEAD'
-    try:
-      urllib2.urlopen(request)
-      return True
-    except urllib2.HTTPError, err:
-      if err.code == 404:
-        return False
+    return self._DoesGSFileExist(url)
 
   def _DoesGSFileExist(self, gs_file_name):
     """Returns True if the GS file can be found, False otherwise."""
@@ -224,40 +150,32 @@ class BuildUpdater(object):
 
   def _GetPlatformFiles(self, platform):
     """Returns a list of filenames to fetch for the given platform."""
-    if self._use_official_version:
-      return BuildUpdater._CHROME_PLATFORM_FILES_MAP[platform]
-    return BuildUpdater._PLATFORM_FILES_MAP[platform]
+    return BuildUpdater._CHROME_PLATFORM_FILES_MAP[platform]
 
   def _DownloadBuilds(self):
     for platform in self._platforms:
       for filename in self._GetPlatformFiles(platform):
         output = os.path.join('dl', platform,
                               '%s_%s_%s' % (platform,
-                                            self._version_or_revision,
+                                            self._version,
                                             filename))
         if os.path.exists(output):
           logging.info('%s alread exists, skipping download', output)
           continue
-        version_or_revision = self._FindBuildVersionOrRevision(
-            platform, self._version_or_revision, filename)
-        if not version_or_revision:
+        version = self._FindBuildVersion(platform, self._version, filename)
+        if not version:
           logging.critical('Failed to find %s build for r%s\n', platform,
-                           self._version_or_revision)
+                           self._version)
           sys.exit(1)
         dirname = os.path.dirname(output)
         if dirname and not os.path.exists(dirname):
           os.makedirs(dirname)
-        url = self._GetBuildUrl(platform, version_or_revision, filename)
+        url = self._GetBuildUrl(platform, version, filename)
         self._DownloadFile(url, output)
 
   def _DownloadFile(self, url, output):
     logging.info('Downloading %s, saving to %s', url, output)
-    if self._use_official_version and self._use_gs:
-      BuildUpdater._GetCmdStatusAndOutput(['gsutil', 'cp', url, output])
-    else:
-      response = urllib2.urlopen(url)
-      with file(output, 'wb') as f:
-        f.write(response.read())
+    BuildUpdater._GetCmdStatusAndOutput(['gsutil', 'cp', url, output])
 
   def _FetchSvnRepos(self):
     if not os.path.exists('reference_builds'):
@@ -354,30 +272,19 @@ class BuildUpdater(object):
 
 def ParseOptions(argv):
   parser = optparse.OptionParser()
-  usage = 'usage: %prog <options>'
+  usage = 'Usage: %prog -v version [-p platforms]'
   parser.set_usage(usage)
   parser.add_option('-v', dest='version',
                     help='Chrome official version to pick up '
                          '(e.g. 30.0.1600.1).')
-  parser.add_option('--gs', dest='use_gs', action='store_true', default=False,
-                    help='Use Google storage for official builds. Used with -b '
-                         'option. Default is false (i.e. use internal storage.')
   parser.add_option('-p', dest='platforms',
                     default='Win,Mac,Linux,Linux_x64',
                     help='Comma separated list of platforms to download '
                          '(as defined by the chromium builders).')
-  parser.add_option('-r', dest='revision',
-                    help='Chromium revision to pick up (e.g. 234567).')
 
   (options, _) = parser.parse_args(argv)
-  if not options.revision and not options.version:
-    logging.critical('Must specify either -r or -v.\n')
-    sys.exit(1)
-  if options.revision and options.version:
-    logging.critical('Must specify either -r or -v but not both.\n')
-    sys.exit(1)
-  if options.use_gs and not options.version:
-    logging.critical('Can only use --gs with -v option.\n')
+  if not options.version:
+    logging.critical('Must specify -v version.\n')

[qyearsley, 2014/08/22 22:06:15]

Note: Since version is not actually optional anymore, this could also be changed
to:

options, args = parser.parse_args(argv)
if not args:
  parser.print_help()
  sys.exit(1)
version = args[0]

...

Then the invocation would be 
$ update_reference_build.py VERSION [-p PLATFORMS]

[tonyg, 2014/08/22 22:18:53]

Done.

     sys.exit(1)
 
   return options