add ACL-setting code to upload_rendered_skps.py

slave/skia_slave_scripts/build_step.py

 # Copyright (c) 2013 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.
 
 """Base class for all slave-side build steps. """
 
 import config
 # pylint: disable=W0611
 import flavor_utils
 import imp
@@ skipping 15 matching lines @@
 # Add important directories to the PYTHONPATH
 sys.path.append(os.path.join(BUILDBOT_PATH))
 sys.path.append(os.path.join(BUILDBOT_PATH, 'site_config'))
 sys.path.append(os.path.join(BUILDBOT_PATH, 'master'))
 sys.path.insert(0, os.path.join(BUILDBOT_PATH, 'common'))
 
 import builder_name_schema
 import slave_hosts_cfg
 import slaves_cfg
 
+from py.utils import gs_utils
 from py.utils import misc
 
 
 DEFAULT_TIMEOUT = 4800
 DEFAULT_NO_OUTPUT_TIMEOUT = 3600
 DEFAULT_NUM_CORES = 2
 
 
 GM_EXPECTATIONS_FILENAME = 'expected-results.json'
 GM_IGNORE_FAILURES_FILE = 'ignored-tests.txt'
 
 
 # multiprocessing.Value doesn't accept boolean types, so we have to use an int.
 INT_TRUE = 1
 INT_FALSE = 0
 build_step_stdout_has_written = multiprocessing.Value('i', INT_FALSE)
 
 
-# The canned acl to use while copying playback files to Google Storage.
-PLAYBACK_CANNED_ACL = 'private'
+# The canned acl to use while copying playback (SKP) files to Google Storage.
+# They should not be world-readable!
+PLAYBACK_CANNED_ACL = gs_utils.PREDEFINED_ACL_PRIVATE
+PLAYBACK_FINEGRAINED_ACL_LIST = [
+    (gs_utils.ID_TYPE_GROUP_BY_DOMAIN, 'google.com', gs_utils.PERMISSION_READ),
+]
+BOTO_CREDENTIALS_FILE = os.path.join(
+    BUILDBOT_PATH, 'third_party', 'chromium_buildbot', 'site_config', '.boto')
 
 
 class BuildStepWarning(Exception):
   pass
 
 
 class BuildStepFailure(Exception):
   pass
 
 
@@ skipping 326 matching lines @@
         else:
           raise BuildStepFailure('Build step failed.')
       except Exception:
         print traceback.format_exc()
         if attempt + 1 >= step.attempts:
           raise
       # pylint: disable=W0212
       step._WaitFunc(attempt)
       attempt += 1
       print '**** %s, attempt %d ****' % (StepType.__name__, attempt + 1)