[NaCl SDK] Add bionic SDK bundle auto-updating to update_nacl_manifest

native_client_sdk/src/build_tools/update_nacl_manifest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Script that reads omahaproxy and gsutil to determine version of SDK to put
 in manifest.
 """
 
 # pylint is convinced the email module is missing attributes
@@ skipping 21 matching lines @@
 
 MANIFEST_BASENAME = 'naclsdk_manifest2.json'
 SCRIPT_DIR = os.path.dirname(__file__)
 REPO_MANIFEST = os.path.join(SCRIPT_DIR, 'json', MANIFEST_BASENAME)
 GS_BUCKET_PATH = 'gs://nativeclient-mirror/nacl/nacl_sdk/'
 GS_SDK_MANIFEST = GS_BUCKET_PATH + MANIFEST_BASENAME
 GS_SDK_MANIFEST_LOG = GS_BUCKET_PATH + MANIFEST_BASENAME + '.log'
 GS_MANIFEST_BACKUP_DIR = GS_BUCKET_PATH + 'manifest_backups/'
 
 CANARY_BUNDLE_NAME = 'pepper_canary'
+BIONIC_CANARY_BUNDLE_NAME = 'bionic_canary'
 CANARY = 'canary'
 NACLPORTS_ARCHIVE_NAME = 'naclports.tar.bz2'
 
 
 logger = logging.getLogger(__name__)
 
 
 def SplitVersion(version_string):
   """Split a version string (e.g. "18.0.1025.163") into its components.
 
@@ skipping 26 matching lines @@
 
   Args:
     platform: One of ('win', 'mac', 'linux').
 
   Returns:
     The basename of the sdk archive for that platform.
   """
   return 'naclsdk_%s.tar.bz2' % platform
 
 
+def GetBionicArchiveName():
+  """Get the basename of an archive. Currently this is linux-only"""
+  return 'naclsdk_bionic.tar.bz2'
+
+
 def GetCanonicalArchiveName(url):
   """Get the canonical name of an archive given its URL.
 
   This will convert "naclsdk_linux.bz2" -> "naclsdk_linux.tar.bz2", and also
   remove everything but the filename of the URL.
 
   This is used below to determine if an expected bundle is found in an version
   directory; the archives all have the same name, but may not exist for a given
   version.
 
@@ skipping 226 matching lines @@
   """Finds a version of a pepper bundle that all desired platforms share.
 
   Args:
     delegate: See Delegate class above.
     platforms: A sequence of platforms to consider, e.g.
         ('mac', 'linux', 'win')
     extra_archives: A sequence of tuples: (archive_basename, minimum_version),
         e.g. [('foo.tar.bz2', '18.0.1000.0'), ('bar.tar.bz2', '19.0.1100.20')]
         These archives must exist to consider a version for inclusion, as
         long as that version is greater than the archive's minimum version.
+    is_bionic: True if we are searching for bionic archives.
   """
-  def __init__(self, delegate, platforms, extra_archives=None):
+  def __init__(self, delegate, platforms, extra_archives=None, is_bionic=False):
     self.delegate = delegate
     self.history = delegate.GetHistory()
     self.platforms = platforms
     self.extra_archives = extra_archives
+    self.is_bionic = is_bionic
 
   def GetMostRecentSharedVersion(self, major_version):
     """Returns the most recent version of a pepper bundle that exists on all
     given platforms.
 
     Specifically, the resulting version should be the most recently released
     (meaning closest to the top of the listing on
     omahaproxy.appspot.com/history) version that has a Chrome release on all
     given platforms, and has a pepper bundle archive for each platform as well.
 
@@ skipping 45 matching lines @@
 
     Args:
       version: The version to find archives for. (e.g. "18.0.1025.164")
       allow_trunk_revisions: If True, will search for archives using the
           trunk revision that matches the branch version.
     Returns:
       A tuple (archives, missing_archives). |archives| is a list of archive
       URLs, |missing_archives| is a list of archive names.
     """
     archive_urls = self._GetAvailableArchivesFor(version)
-    platform_archives = set(GetPlatformArchiveName(p) for p in self.platforms)
-    expected_archives = platform_archives
+
+    if self.is_bionic:
+      # Bionic currently is Linux-only.
+      expected_archives = set([GetBionicArchiveName()])
+    else:
+      expected_archives = set(GetPlatformArchiveName(p) for p in self.platforms)
+
     if self.extra_archives:
       for extra_archive, extra_archive_min_version in self.extra_archives:
         if SplitVersion(version) >= SplitVersion(extra_archive_min_version):
           expected_archives.add(extra_archive)
     found_archives = set(GetCanonicalArchiveName(a) for a in archive_urls)
     missing_archives = expected_archives - found_archives
+
     if allow_trunk_revisions and missing_archives:
       # Try to find trunk versions of any missing archives.
       trunk_version = self.delegate.GetTrunkRevision(version)
       trunk_archives = self._GetAvailableArchivesFor(trunk_version)
       for trunk_archive_url in trunk_archives:
         trunk_archive = GetCanonicalArchiveName(trunk_archive_url)
         if trunk_archive in missing_archives:
           archive_urls.append(trunk_archive_url)
           missing_archives.discard(trunk_archive)
 
@@ skipping 372 matching lines @@
         e.g. ('pepper_21', '21.0.1145.0')
   """
   if fixed_bundle_versions:
     fixed_bundle_versions = dict(fixed_bundle_versions)
   else:
     fixed_bundle_versions = {}
 
   manifest = delegate.GetRepoManifest()
   auto_update_bundles = []
   for bundle in manifest.GetBundles():
-    if not bundle.name.startswith('pepper_'):
+    if not bundle.name.startswith(('pepper_', 'bionic_')):
       continue
     archives = bundle.GetArchives()
     if not archives:
       auto_update_bundles.append(bundle)
 
   if not auto_update_bundles:
     logger.info('No versions need auto-updating.')
     return
 
-  version_finder = VersionFinder(delegate, platforms, extra_archives)
   updater = Updater(delegate)
 
   for bundle in auto_update_bundles:
     try:
-      if bundle.name == CANARY_BUNDLE_NAME:
+      if bundle.name == BIONIC_CANARY_BUNDLE_NAME:
+        logger.info('>>> Looking for most recent bionic_canary...')
+        version_finder = VersionFinder(delegate, platforms, extra_archives,
+                                       is_bionic=True)
+        version, channel, archives = version_finder.GetMostRecentSharedCanary()
+      elif bundle.name == CANARY_BUNDLE_NAME:
         logger.info('>>> Looking for most recent pepper_canary...')
+        version_finder = VersionFinder(delegate, platforms, extra_archives)
         version, channel, archives = version_finder.GetMostRecentSharedCanary()
       else:
         logger.info('>>> Looking for most recent pepper_%s...' %
             bundle.version)
+        version_finder = VersionFinder(delegate, platforms, extra_archives)
         version, channel, archives = version_finder.GetMostRecentSharedVersion(
             bundle.version)
     except NoSharedVersionException:
       # If we can't find a shared version, make sure that there is an uploaded
       # bundle with that name already.
       updater.AddLockedBundle(bundle.name)
       continue
 
     if bundle.name in fixed_bundle_versions:
       # Ensure this version is valid for all platforms.
@@ skipping 106 matching lines @@
         gsutil_logging_handler.upload()
   except manifest_util.Error as e:
     if options.debug:
       raise
     sys.stderr.write(str(e) + '\n')
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))