adjust prefetch URL we hit in UploadRenderedSKPs, and display view URL in CompareRenderedSKPs

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 2558013b2b0314c0a9d6bab05b9cb9a15b1fd3bf..cbc7dc004e41fdbcadd9d8c77676869928a60b23 100644
--- a/slave/skia_slave_scripts/upload_rendered_skps.py
+++ b/slave/skia_slave_scripts/upload_rendered_skps.py
@@ -14,9 +14,10 @@ from build_step import BuildStep
 from utils import gs_utils
 import skia_vars
 
-PREFETCH_URL_FORMATTER = (
-    'http://skia-tree-status.appspot.com/redirect/rebaseline-server/prefetch/'
-    'setADir={set_a_dir}&setBDir={set_b_dir}')
+URL_FORMATTER = (
+    'http://skia-tree-status.appspot.com/redirect/rebaseline-server/'
+    '{directive}setADir={actuals_summary_dir}&setBDir={actuals_summary_dir}&'
+    'setASection=expected-results&setBSection=actual-results')
 
 
 class UploadRenderedSKPs(BuildStep):
@@ -55,21 +56,18 @@ class UploadRenderedSKPs(BuildStep):
     # when any of the results changed.
     src_dir = os.path.abspath(self.playback_actual_summaries_dir)
     dest_bucket = self._gs_summaries_bucket
-    dest_dir = self._args['builder_name']
+    builder_name = self._builder_name
     if os.listdir(src_dir):
       print ('Uploading image summaries from %s to gs://%s/%s' % (
-          src_dir, dest_bucket, dest_dir))
+          src_dir, dest_bucket, builder_name))
       gs.upload_dir_contents(
-          source_dir=src_dir, dest_bucket=dest_bucket, dest_dir=dest_dir,
+          source_dir=src_dir, dest_bucket=dest_bucket, dest_dir=builder_name,
           upload_if=gs.UploadIf.IF_MODIFIED,
           predefined_acl=gs.PLAYBACK_CANNED_ACL,
           fine_grained_acl_list=gs.PLAYBACK_FINEGRAINED_ACL_LIST)
       # Tell rebaseline_server to prefetch latest SKP results.
-      prefetch_url = PREFETCH_URL_FORMATTER.format(
-          set_a_dir=urllib.quote('gs://%s/%s' % (dest_bucket, dest_dir),
-                                 safe=''),
-          set_b_dir=urllib.quote('repo:expectations/skp/%s' % dest_dir,
-                                 safe=''))
+      prefetch_url = rebaseline_server_url(
+          directive='prefetch/', builder_name=builder_name)
       print ('Triggering prefetch URL %s' % prefetch_url)
       with contextlib.closing(urllib.urlopen(prefetch_url)):
         pass
@@ -77,5 +75,21 @@ class UploadRenderedSKPs(BuildStep):
       print ('Skipping upload to Google Storage, because no image summaries '
              'in %s' % src_dir)
 
+
+def rebaseline_server_url(directive, builder_name):
+  """Returns the URL for results from this builder on rebaseline_server.
+
+  Args:
+    directive: part of the URL, indicating whether to generate a 'prefetch'
+        URL, a 'live-loader' URL, or a link to live-view.html
+    builder_name: name of this builder
+  """
+  bucket = skia_vars.GetGlobalVariable('skp_summaries_bucket')
+  return URL_FORMATTER.format(
+      directive=directive,
+      actuals_summary_dir=urllib.quote(
+          'gs://%s/%s' % (bucket, builder_name), safe=''))
+
+
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(UploadRenderedSKPs))