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..c2a2fe0cd2fc6270bba019560f441631eea9b0b0 100644
--- a/slave/skia_slave_scripts/upload_rendered_skps.py
+++ b/slave/skia_slave_scripts/upload_rendered_skps.py
@@ -3,17 +3,19 @@
 # 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 build_step import BuildStep, PLAYBACK_CANNED_ACL
+from utils import gs_utils
+import skia_vars
 import upload_gm_results
 
+SUBDIR_NAME = 'rendered-skps'
+
 
 class UploadRenderedSKPs(upload_gm_results.UploadGMResults):
 
@@ -22,9 +24,16 @@ 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=PLAYBACK_CANNED_ACL)
+    # TODO(epoger): Change ACLs of files uploaded to Google Storage to
+    # google.com:READ .  See _SetGoogleReadACLs() in
+    # https://skia.googlesource.com/buildbot/+/master/slave/skia_slave_scripts/webpages_playback.py
+    self._SVNUploadJsonFiles(src_dir=self.playback_actual_summaries_dir,
+                             dest_subdir=SUBDIR_NAME)
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(UploadRenderedSKPs))