| 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
|
| deleted file mode 100644
|
| index cbc7dc004e41fdbcadd9d8c77676869928a60b23..0000000000000000000000000000000000000000
|
| --- a/slave/skia_slave_scripts/upload_rendered_skps.py
|
| +++ /dev/null
|
| @@ -1,95 +0,0 @@
|
| -#!/usr/bin/env python
|
| -# Copyright (c) 2014 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.
|
| -
|
| -"""Uploads the results of render_skps.py."""
|
| -
|
| -import contextlib
|
| -import os
|
| -import sys
|
| -import urllib
|
| -
|
| -from build_step import BuildStep
|
| -from utils import gs_utils
|
| -import skia_vars
|
| -
|
| -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):
|
| -
|
| - def __init__(self, attempts=3, **kwargs):
|
| - super(UploadRenderedSKPs, self).__init__(
|
| - attempts=attempts, **kwargs)
|
| - self._gs_images_bucket = skia_vars.GetGlobalVariable('skp_images_bucket')
|
| - self._gs_summaries_bucket = skia_vars.GetGlobalVariable(
|
| - 'skp_summaries_bucket')
|
| -
|
| - def _Run(self):
|
| - gs = gs_utils.GSUtils()
|
| -
|
| - # Upload any new image files to Google Storage.
|
| - # We use checksum-based filenames, so any files which have already been
|
| - # uploaded don't need to be uploaded again.
|
| - src_dir = os.path.abspath(self.playback_actual_images_dir)
|
| - dest_bucket = self._gs_images_bucket
|
| - if os.listdir(src_dir):
|
| - print 'Uploading image files from %s to gs://%s/' % (
|
| - src_dir, dest_bucket)
|
| - gs.upload_dir_contents(
|
| - source_dir=src_dir, dest_bucket=dest_bucket, dest_dir=None,
|
| - upload_if=gs.UploadIf.IF_NEW,
|
| - predefined_acl=gs.PLAYBACK_CANNED_ACL,
|
| - fine_grained_acl_list=gs.PLAYBACK_FINEGRAINED_ACL_LIST)
|
| - else:
|
| - print ('Skipping upload to Google Storage, because no image files in %s' %
|
| - src_dir)
|
| -
|
| - # Upload image summaries (checksums) to Google Storage.
|
| - #
|
| - # It's important to only upload each summary file if it has changed,
|
| - # because we use the history of the file in Google Storage to tell us
|
| - # when any of the results changed.
|
| - src_dir = os.path.abspath(self.playback_actual_summaries_dir)
|
| - dest_bucket = self._gs_summaries_bucket
|
| - builder_name = self._builder_name
|
| - if os.listdir(src_dir):
|
| - print ('Uploading image summaries from %s to gs://%s/%s' % (
|
| - src_dir, dest_bucket, builder_name))
|
| - gs.upload_dir_contents(
|
| - 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 = rebaseline_server_url(
|
| - directive='prefetch/', builder_name=builder_name)
|
| - print ('Triggering prefetch URL %s' % prefetch_url)
|
| - with contextlib.closing(urllib.urlopen(prefetch_url)):
|
| - pass
|
| - else:
|
| - 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))
|
|
|