add ACL-setting code to upload_rendered_skps.py

tools/rebaseline_webpage_images.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.
 
 """Rebaselines the specified gm_image_subdir or all gm_image_subdirs.
 
 Note:
   Please make sure the gm-actuals of the builders of interest are not being
   updated at the time this script is run, or else this script will wait for
@@ skipping 19 matching lines @@
 import time
 
 # Set the PYTHONPATH for this script to include chromium_buildbot scripts and
 # site_config and skia_slave_scripts.
 sys.path.append(
     os.path.join(os.pardir, 'third_party', 'chromium_buildbot', 'scripts'))
 sys.path.append(
     os.path.join(os.pardir, 'third_party', 'chromium_buildbot', 'site_config'))
 sys.path.append(os.path.join(os.pardir, 'slave', 'skia_slave_scripts'))
 
-from build_step import PLAYBACK_CANNED_ACL
 from common import chromium_utils
 from slave import slave_utils
 from slave import svn
 from utils import gs_utils
+from utils import old_gs_utils
 from utils import sync_bucket_subdir
 
 import compare_and_upload_webpage_gms
 import playback_dirs
 
 
 GM_IMAGE_TO_BASELINE_BUILDER = {
     'base-shuttle-win7-intel-float':
         'Skia_Shuttle_Win7_Intel_Float_Release_32',
     'base-shuttle-win7-intel-angle':
@@ skipping 54 matching lines @@
   if not gm_image_subdir in GM_IMAGE_TO_BASELINE_BUILDER:
     raise ValueError(
         'Unknown specified gm_image_subdir (%s). Please use one from:\n%s' % (
             gm_image_subdir, str(GM_IMAGE_TO_BASELINE_BUILDER.keys())))
 
 
 dest_gsbase = sync_bucket_subdir.DEFAULT_PERFDATA_GS_BASE
 
 
 # Ensure the right .boto file is used by gsutil.
-if not gs_utils.DoesStorageObjectExist(dest_gsbase):
+if not old_gs_utils.DoesStorageObjectExist(dest_gsbase):
   raise Exception(
       'Missing .boto file or .boto does not have the right credentials. Please '
       'see https://docs.google.com/a/google.com/document/d/1ZzHP6M5qACA9nJnLq'
       'OZr2Hl0rjYqE4yQsQWAfVjKCzs/edit (may have to request access)')
 
 
 for gm_image_subdir in gm_images_seq:
   print '\n\n'
   print '======================================================================'
   print 'Rebaselining %s images' % gm_image_subdir
   print '======================================================================'
 
   builder_name = GM_IMAGE_TO_BASELINE_BUILDER[gm_image_subdir]
   
   storage_playback_dirs = playback_dirs.StorageSkpPlaybackDirs(
     builder_name=builder_name,
     gm_image_subdir=gm_image_subdir,
     perf_output_basedir=None)
 
   gm_actual_dir = posixpath.join(
       dest_gsbase, storage_playback_dirs.PlaybackGmActualDir())
   gm_expected_dir = posixpath.join(
       dest_gsbase, storage_playback_dirs.PlaybackGmExpectedDir())
 
   print '\n\n=======Throw an Exception if gm_actual_dir does not exist======='
-  if not gs_utils.DoesStorageObjectExist(gm_actual_dir):
+  if not old_gs_utils.DoesStorageObjectExist(gm_actual_dir):
     raise Exception("%s does not exist in Google Storage!" % gm_actual_dir)
 
   print '\n\n=======Wait if gm_actual_dir is being updated======='
   keep_waiting = True
   while(keep_waiting):
-    gm_actual_started_timestamp = gs_utils.ReadTimeStampFile(
-        timestamp_file_name=gs_utils.TIMESTAMP_STARTED_FILENAME,
+    gm_actual_started_timestamp = old_gs_utils.ReadTimeStampFile(
+        timestamp_file_name=old_gs_utils.TIMESTAMP_STARTED_FILENAME,
         gs_base=dest_gsbase,
         gs_relative_dir=storage_playback_dirs.PlaybackGmActualDir())
-    gm_actual_completed_timestamp = gs_utils.ReadTimeStampFile(
-        timestamp_file_name=gs_utils.TIMESTAMP_COMPLETED_FILENAME,
+    gm_actual_completed_timestamp = old_gs_utils.ReadTimeStampFile(
+        timestamp_file_name=old_gs_utils.TIMESTAMP_COMPLETED_FILENAME,
         gs_base=dest_gsbase,
         gs_relative_dir=storage_playback_dirs.PlaybackGmActualDir())
     if gm_actual_started_timestamp != gm_actual_completed_timestamp:
       print '\n\nSleep for a minute since gm_actual_dir is being updated.'
       print 'Please manually exit the script if you want to rerun it later.\n'
       time.sleep(60)
     else:
       keep_waiting = False
 
   print '\n\n=======Add the REBASELINE_IN_PROGRESS lock file======='
-  gs_utils.WriteTimeStampFile(
+  old_gs_utils.WriteTimeStampFile(
       timestamp_file_name=(
           compare_and_upload_webpage_gms.REBASELINE_IN_PROGRESS_FILENAME),
       timestamp_value=time.time(),
       gs_base=dest_gsbase,
       gs_relative_dir=storage_playback_dirs.PlaybackGmActualDir(),
-      gs_acl=PLAYBACK_CANNED_ACL)
+      gs_acl=gs_utils.GSUtils.PLAYBACK_CANNED_ACL)
 
   print '\n\n=======Delete contents of gm_expected_dir======='
-  gs_utils.DeleteStorageObject(gm_expected_dir)
+  old_gs_utils.DeleteStorageObject(gm_expected_dir)
 
   print '\n\n=====Copy all contents from gm_actual_dir to gm_expected_dir======'
 
   # Gather list of all files.
-  gm_actual_contents = gs_utils.ListStorageDirectory(
+  gm_actual_contents = old_gs_utils.ListStorageDirectory(
       dest_gsbase, storage_playback_dirs.PlaybackGmActualDir())
 
   # Remove REBASELINE, TIMESTAMP_* and COMPARISON files from the list.
   for file_to_remove in (
       compare_and_upload_webpage_gms.REBASELINE_IN_PROGRESS_FILENAME,
-      gs_utils.TIMESTAMP_STARTED_FILENAME,
-      gs_utils.TIMESTAMP_COMPLETED_FILENAME,
+      old_gs_utils.TIMESTAMP_STARTED_FILENAME,
+      old_gs_utils.TIMESTAMP_COMPLETED_FILENAME,
       compare_and_upload_webpage_gms.LAST_COMPARISON_FILENAME):
     gs_file_to_remove = posixpath.join(gm_actual_dir, file_to_remove)
     if gs_file_to_remove in gm_actual_contents:
       gm_actual_contents.remove(gs_file_to_remove)
 
   # Copy over files in chunks.
   # pylint: disable=W0212
-  for files_chunk in gs_utils._GetChunks(gm_actual_contents,
-                                         gs_utils.FILES_CHUNK):
+  for files_chunk in old_gs_utils._GetChunks(gm_actual_contents,
+                                             old_gs_utils.FILES_CHUNK):
     gsutil = slave_utils.GSUtilSetup()
     command = ([gsutil, 'cp'] + files_chunk +
                [posixpath.join(gm_expected_dir, '')])
     if chromium_utils.RunCommand(command) != 0:
       raise Exception(
           'Could not upload the chunk to Google Storage! The chunk: %s'
           % files_chunk)
 
   print '\n\n=======Delete the REBASELINE_IN_PROGRESS lock file======='
-  gs_utils.DeleteStorageObject(
+  old_gs_utils.DeleteStorageObject(
       posixpath.join(
           gm_actual_dir,
           compare_and_upload_webpage_gms.REBASELINE_IN_PROGRESS_FILENAME))
 
   print '\n\n=======Update gm_expected_dir timestamp======='
-  gs_utils.WriteTimeStampFile(
-      timestamp_file_name=gs_utils.TIMESTAMP_COMPLETED_FILENAME,
+  old_gs_utils.WriteTimeStampFile(
+      timestamp_file_name=old_gs_utils.TIMESTAMP_COMPLETED_FILENAME,
       timestamp_value=time.time(),
       gs_base=dest_gsbase,
       gs_relative_dir=storage_playback_dirs.PlaybackGmExpectedDir(),
-      gs_acl=PLAYBACK_CANNED_ACL,
+      gs_acl=gs_utils.GSUtils.PLAYBACK_CANNED_ACL,
       local_dir=None)
 
   print '\n\n=======Add LAST_REBASELINED_BY file======='
-  gs_utils.WriteTimeStampFile(
-      timestamp_file_name=gs_utils.LAST_REBASELINED_BY_FILENAME,
+  old_gs_utils.WriteTimeStampFile(
+      timestamp_file_name=old_gs_utils.LAST_REBASELINED_BY_FILENAME,
       timestamp_value=getpass.getuser(),
       gs_base=dest_gsbase,
       gs_relative_dir=storage_playback_dirs.PlaybackGmExpectedDir(),
-      gs_acl=PLAYBACK_CANNED_ACL,
+      gs_acl=gs_utils.GSUtils.PLAYBACK_CANNED_ACL,
       local_dir=None)
 
 
 # Submit whitespace change to trigger rebuilds if skia trunk location, svn
 # username and password have been provided.
 if commit_whitespace_change:
   skia_trunk_dir = sys.argv[2]
   svn_username = sys.argv[3]
   svn_password = sys.argv[4]
   repo = svn.Svn(skia_trunk_dir, svn_username, svn_password,
                  additional_svn_flags=['--trust-server-cert', '--no-auth-cache',
                                        '--non-interactive'])
   whitespace_file = open(os.path.join(skia_trunk_dir, 'whitespace.txt'), 'a')
   try:
     whitespace_file.write('\n')
   finally:
     whitespace_file.close()
 
   print '\n\n=======Submit whitespace change to trigger rebuilds======='
   builders_to_run = []
   for gm_image_subdir in gm_images_seq:
     builders_to_run.append(GM_IMAGE_TO_BASELINE_BUILDER[gm_image_subdir])
   run_builders_keyword = '(RunBuilders:%s)' % ','.join(builders_to_run)
   # pylint: disable=W0212
   repo._RunSvnCommand(
       ['commit', '--message',
        'Rebaselined webpage image GMs for %s on Google Storage.\n%s'
            % (gm_images_seq, run_builders_keyword),
        'whitespace.txt'])