upload SKP renderings that did not match expectations

slave/skia_slave_scripts/upload_rendered_skps.py

Index: slave/skia_slave_scripts/upload_rendered_skps.py
diff --git a/slave/skia_slave_scripts/upload_rendered_skps.py b/slave/skia_slave_scripts/upload_rendered_skps.py
index d3fd49d35a8b36de9e4ac383e24431d12038473e..bb674973260a168c3dde388801bff42bbc0fc124 100644
--- a/slave/skia_slave_scripts/upload_rendered_skps.py
+++ b/slave/skia_slave_scripts/upload_rendered_skps.py
@@ -3,17 +3,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Uploads the results of render_skps.py.
-
-TODO(epoger): In the midst of re-implementing using checksums;
-see https://code.google.com/p/skia/issues/detail?id=1942
-"""
+"""Uploads the results of render_skps.py."""
 
+import os
+import posixpath
 import sys
 
 from build_step import BuildStep
+from utils import gs_utils
+import skia_vars
 import upload_gm_results
 
+# EPOGER: Before committing, find out from Ravi how GS_* should be set.

[epoger, 2014/05/19 19:35:40]

Ravi- please weigh in on this.

We are uploading images of SKP test pages to Google Storage, and JSON summaries
(lists of image checksums) to skia-autogen.

My guess is that the images need to be invite-only, but it's OK for the
summaries to be world-readable.  Does that seem right?  And if so, have I set
the permissions properly here?

[rmistry, 2014/05/20 11:11:35]

Yes this looks correct. Stop by when you have a chance today, there is something
related to permissions here I would like to discuss.

+GS_ACL = 'project-private'
+GS_HTTP_HEADER_LINES = None  # EPOGER: since these are private, we don't use ['Cache-Control:public,max-age=3600'] as we do for GM results. Right?
+SUBDIR_NAME = 'rendered-skps'
+
 
 class UploadRenderedSKPs(upload_gm_results.UploadGMResults):
 
@@ -22,9 +27,14 @@ class UploadRenderedSKPs(upload_gm_results.UploadGMResults):
         attempts=attempts, **kwargs)
 
   def _Run(self):
-    self._SVNUploadJsonFiles(src_dir=self.skp_out_dir,
-                             dest_subdir='rendered-skps')
-
+    gs_utils.copy_storage_directory(
+        src_dir=os.path.abspath(self.playback_actual_images_dir),
+        dest_dir=posixpath.join(
+            skia_vars.GetGlobalVariable('googlestorage_bucket'), SUBDIR_NAME),
+        gs_acl=GS_ACL,
+        http_header_lines=GS_HTTP_HEADER_LINES)
+    self._SVNUploadJsonFiles(src_dir=self.playback_actual_summaries_dir,
+                             dest_subdir=SUBDIR_NAME)
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(UploadRenderedSKPs))