Index: slave/skia_slave_scripts/build_step.py |
diff --git a/slave/skia_slave_scripts/build_step.py b/slave/skia_slave_scripts/build_step.py |
index 9a821de5b0b1112d13de5dbe897f959338377eb5..7c702a1e45efe6582d3e7e172804a1f08e05d58a 100644 |
--- a/slave/skia_slave_scripts/build_step.py |
+++ b/slave/skia_slave_scripts/build_step.py |
@@ -33,6 +33,7 @@ import builder_name_schema |
import slave_hosts_cfg |
import slaves_cfg |
+from py.utils import gs_utils |
from py.utils import misc |
@@ -51,8 +52,14 @@ 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), |
+] |
borenet
2014/07/18 22:11:12
I would strongly prefer that these go into gs_util
epoger
2014/07/21 13:42:51
Given that the buildbots write SKP files into Goog
borenet
2014/07/21 14:07:46
I like #1 and #3 (though I really don't like the "
epoger
2014/07/21 20:01:31
Cool idea. I went with it... in order to do it wi
|
+BOTO_CREDENTIALS_FILE = os.path.join( |
+ BUILDBOT_PATH, 'third_party', 'chromium_buildbot', 'site_config', '.boto') |
epoger
2014/07/18 21:10:24
This is where we already put the .boto file on the
borenet
2014/07/21 14:07:46
If it's okay with you, let's leave it as-is, since
epoger
2014/07/21 20:01:31
Now, users of gs_utils.py within buildbot automati
|
class BuildStepWarning(Exception): |