add ACL-setting code to upload_rendered_skps.py

slave/skia_slave_scripts/webpages_playback.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.
 
 """Archives or replays webpages and creates SKPs in a Google Storage location.
 
 To archive webpages and store SKP files (archives should be rarely updated):
 
 cd ../buildbot/slave/skia_slave_scripts
@@ skipping 51 matching lines @@
 # and site_config.
 BUILDBOT_PATH = os.path.realpath(os.path.join(
     os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir))
 sys.path.append(os.path.join(BUILDBOT_PATH, 'common'))
 sys.path.append(os.path.join(BUILDBOT_PATH, 'third_party', 'chromium_buildbot',
                              'scripts'))
 sys.path.append(os.path.join(BUILDBOT_PATH, 'third_party', 'chromium_buildbot',
                              'site_config'))
 
 from utils import file_utils
-from utils import old_gs_utils as gs_utils
+from utils import gs_utils
+from utils import old_gs_utils
 from py.utils import misc
 from py.utils import shell_utils
 
 from slave import slave_utils
 
-from build_step import PLAYBACK_CANNED_ACL
 from playback_dirs import ROOT_PLAYBACK_DIR_NAME
 from playback_dirs import SKPICTURES_DIR_NAME
 
 
 # Local archive and SKP directories.
 LOCAL_PLAYBACK_ROOT_DIR = os.path.join(
     tempfile.gettempdir(), ROOT_PLAYBACK_DIR_NAME)
 LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data')
 TMP_SKP_DIR = tempfile.mkdtemp()
@@ skipping 78 matching lines @@
     elif '*' in page_sets:
       # Explode and return the glob.
       return glob.glob(page_sets)
     else:
       return page_sets.split(',')
 
   def Run(self):
     """Run the SkPicturePlayback BuildStep."""
 
     # Ensure the right .boto file is used by gsutil.
-    if not self._skip_all_gs_access and gs_utils.read_timestamp_file(
-        timestamp_file_name=gs_utils.TIMESTAMP_COMPLETED_FILENAME,
+    if not self._skip_all_gs_access and old_gs_utils.read_timestamp_file(
+        timestamp_file_name=old_gs_utils.TIMESTAMP_COMPLETED_FILENAME,
         gs_base=self._dest_gsbase,
         gs_relative_dir=posixpath.join(ROOT_PLAYBACK_DIR_NAME,
                                        SKPICTURES_DIR_NAME)) == "0":
       raise Exception(
           'Missing .boto file or .boto does not have the right credentials.'
           'Please see https://docs.google.com/a/google.com/document/d/1ZzHP6M5q'
           'ACA9nJnLqOZr2Hl0rjYqE4yQsQWAfVjKCzs/edit '
           '(may have to request access). The .boto file will need to be placed '
           'under third_party/chromium_buildbot/site_config/')
 
@@ skipping 150 matching lines @@
     if not self._skip_all_gs_access and self._upload_to_gs:
       print '\n\n=======Uploading to Google Storage=======\n\n'
       # Copy the directory structure in the root directory into Google Storage.
       dest_dir_name = ROOT_PLAYBACK_DIR_NAME
       if self._alternate_upload_dir:
         dest_dir_name = self._alternate_upload_dir
       gs_status = slave_utils.GSUtilCopyDir(
           src_dir=LOCAL_PLAYBACK_ROOT_DIR,
           gs_base=self._dest_gsbase,
           dest_dir=dest_dir_name,
-          gs_acl=PLAYBACK_CANNED_ACL)
+          gs_acl=gs_utils.GSUtils.PLAYBACK_CANNED_ACL)
       if gs_status != 0:
         raise Exception(
             'ERROR: GSUtilCopyDir error %d. "%s" -> "%s/%s"' % (
                 gs_status, LOCAL_PLAYBACK_ROOT_DIR, self._dest_gsbase,
                 ROOT_PLAYBACK_DIR_NAME))
       self._SetGoogleReadACLs(
           posixpath.join(self._dest_gsbase, dest_dir_name, SKPICTURES_DIR_NAME))
 
       # Add a timestamp file to the SKP directory in Google Storage so we can
       # use directory level rsync like functionality.
-      gs_utils.write_timestamp_file(
-          timestamp_file_name=gs_utils.TIMESTAMP_COMPLETED_FILENAME,
+      old_gs_utils.write_timestamp_file(
+          timestamp_file_name=old_gs_utils.TIMESTAMP_COMPLETED_FILENAME,
           timestamp_value=time.time(),
           gs_base=self._dest_gsbase,
           gs_relative_dir=posixpath.join(dest_dir_name, SKPICTURES_DIR_NAME),
-          gs_acl=PLAYBACK_CANNED_ACL,
+          gs_acl=gs_utils.GSUtils.PLAYBACK_CANNED_ACL,
           local_dir=LOCAL_PLAYBACK_ROOT_DIR)
 
       print '\n\n=======New SKPs have been uploaded to %s =======\n\n' % (
           posixpath.join(self._dest_gsbase, dest_dir_name, SKPICTURES_DIR_NAME))
     else:
       print '\n\n=======Not Uploading to Google Storage=======\n\n'
       print 'Generated resources are available in %s\n\n' % (
           LOCAL_PLAYBACK_ROOT_DIR)
 
     return 0
@@ skipping 46 matching lines @@
     file_utils.create_clean_local_dir(self._local_skp_dir)
 
   def _DownloadWebpagesArchive(self, wpr_data_file, page_set_basename):
     """Downloads the webpages archive and its required page set from GS."""
     wpr_source = posixpath.join(
         self._dest_gsbase, ROOT_PLAYBACK_DIR_NAME, 'webpages_archive',
         wpr_data_file)
     page_set_source = posixpath.join(
         self._dest_gsbase, ROOT_PLAYBACK_DIR_NAME, 'webpages_archive',
         page_set_basename)
-    if (gs_utils.does_storage_object_exist(wpr_source) and
-        gs_utils.does_storage_object_exist(page_set_source)):
+    if (old_gs_utils.does_storage_object_exist(wpr_source) and
+        old_gs_utils.does_storage_object_exist(page_set_source)):
       slave_utils.GSUtilDownloadFile(
           src=wpr_source, dst=LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR)
       slave_utils.GSUtilDownloadFile(
           src=page_set_source, dst=LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR)
     else:
       raise Exception('%s and %s do not exist in Google Storage!' % (
           wpr_source, page_set_source))
 
 
 if '__main__' == __name__:
   option_parser = optparse.OptionParser()
   option_parser.add_option(
       '', '--page_sets',
       help='Specifies the page sets to use to archive. Supports globs.',
       default='all')
   option_parser.add_option(
       '', '--skip_all_gs_access', action='store_true',
       help='All Google Storage interactions will be skipped if this flag is '
            'specified. This is useful for cases where the user does not have '
            'the required .boto file but would like to generate webpage '
            'archives and SKPs from the Skia page sets.',
       default=False)
   option_parser.add_option(
       '', '--record', action='store_true',
       help='Specifies whether a new website archive should be created.',
       default=False)
   option_parser.add_option(
       '', '--dest_gsbase',
       help='gs:// bucket_name, the bucket to upload the file to.',
-      default=gs_utils.DEFAULT_DEST_GSBASE)
+      default=old_gs_utils.DEFAULT_DEST_GSBASE)
   option_parser.add_option(
       '', '--skia_tools',
       help=('Path to compiled Skia executable tools. '
             'render_pictures/render_pdfs/bench_pictures is run on the set '
             'after all SKPs are captured. If the script is run without '
             '--non-interactive then the debugger is also run at the end. Debug '
             'builds are recommended because they seem to catch more failures '
             'than Release builds.'),
       default=None)
   option_parser.add_option(
@@ skipping 15 matching lines @@
       default=None)
   option_parser.add_option(
       '', '--non-interactive', action='store_true',
       help='Runs the script without any prompts. If this flag is specified and '
            '--skia_tools is specified then the debugger is not run.',
       default=False)
   options, unused_args = option_parser.parse_args()
 
   playback = SkPicturePlayback(options)
   sys.exit(playback.Run())