50cd9e9cd1
This reverts commit 4e91f16fdf.
Reason for revert: Still does not work
Original change's description:
> Re-enable uploading to partner bucket
>
> This is a revert of
> https://skia.googlesource.com/skia/+/da066b865c1e2777a84a829486a7b37a984484b4
>
> NoTry: true
> Bug: skia:6797
> Change-Id: I9eca7e4b2234c79e39b2c25aaf459512dd206acc
> Reviewed-on: https://skia-review.googlesource.com/23202
> Commit-Queue: Ravi Mistry <rmistry@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>
TBR=borenet@google.com,rmistry@google.com
Change-Id: If1abb65801ba93d409825e290e22d7a9eb3818fa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6797
Reviewed-on: https://skia-review.googlesource.com/23004
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
145 lines
4.6 KiB
Python
145 lines
4.6 KiB
Python
# Copyright 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.
|
|
|
|
|
|
"""Recipe for the Skia RecreateSKPs Bot."""
|
|
|
|
|
|
DEPS = [
|
|
'core',
|
|
'depot_tools/gclient',
|
|
'depot_tools/gsutil',
|
|
'infra',
|
|
'recipe_engine/context',
|
|
'recipe_engine/file',
|
|
'recipe_engine/path',
|
|
'recipe_engine/properties',
|
|
'recipe_engine/python',
|
|
'recipe_engine/raw_io',
|
|
'recipe_engine/step',
|
|
'run',
|
|
'vars',
|
|
]
|
|
|
|
|
|
TEST_BUILDERS = {
|
|
'client.skia.compile': {
|
|
'skiabot-linux-swarm-000': [
|
|
'Housekeeper-Nightly-RecreateSKPs_Canary',
|
|
'Housekeeper-Weekly-RecreateSKPs',
|
|
],
|
|
},
|
|
}
|
|
|
|
|
|
UPDATE_SKPS_GITCOOKIES_FILE = 'update_skps.git_cookies'
|
|
|
|
UPDATE_SKPS_GITCOOKIES_GS_PATH = (
|
|
'gs://skia-buildbots/artifacts/server/.gitcookies_update-skps')
|
|
|
|
|
|
class DownloadGitCookies(object):
|
|
"""Class to download gitcookies from GS."""
|
|
def __init__(self, gs_path, local_path, api):
|
|
self._gs_path = gs_path
|
|
self._local_path = local_path
|
|
self._api = api
|
|
|
|
def __enter__(self):
|
|
gsutil_args = ['cp', self._gs_path, self._local_path]
|
|
self._api.gsutil(gsutil_args, use_retry_wrapper=False)
|
|
|
|
def __exit__(self, exc_type, _value, _traceback):
|
|
if self._api.path.exists(self._local_path):
|
|
self._api.file.remove('remove %s' % self._local_path, self._local_path)
|
|
|
|
|
|
|
|
def RunSteps(api):
|
|
# Check out Chrome.
|
|
api.core.setup()
|
|
|
|
src_dir = api.vars.checkout_root.join('src')
|
|
out_dir = src_dir.join('out', 'Release')
|
|
|
|
with api.context(cwd=src_dir):
|
|
# Call GN.
|
|
platform = 'linux64' # This bot only runs on linux; don't bother checking.
|
|
gn = src_dir.join('buildtools', platform, 'gn')
|
|
gn_env = {'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1',
|
|
'GYP_GENERATORS': 'ninja'}
|
|
with api.context(env=gn_env):
|
|
api.run(api.step, 'GN', cmd=[gn, 'gen', out_dir])
|
|
|
|
# Build Chrome.
|
|
api.run(api.step, 'Build Chrome', cmd=['ninja', '-C', out_dir, 'chrome'])
|
|
|
|
# Clean up the output dir.
|
|
output_dir = api.path['start_dir'].join('skp_output')
|
|
if api.path.exists(output_dir):
|
|
api.run.rmtree(output_dir)
|
|
api.file.ensure_directory('makedirs skp_output', output_dir)
|
|
|
|
# Capture the SKPs.
|
|
asset_dir = api.vars.infrabots_dir.join('assets', 'skp')
|
|
cmd = ['python', asset_dir.join('create.py'),
|
|
'--chrome_src_path', src_dir,
|
|
'--browser_executable', src_dir.join('out', 'Release', 'chrome'),
|
|
'--target_dir', output_dir]
|
|
# TODO(rmistry): Uncomment the below after skbug.com/6797 is fixed.
|
|
# if 'Canary' not in api.properties['buildername']:
|
|
# cmd.append('--upload_to_partner_bucket')
|
|
with api.context(cwd=api.vars.skia_dir):
|
|
api.run(api.step, 'Recreate SKPs', cmd=cmd)
|
|
|
|
# Upload the SKPs.
|
|
if 'Canary' not in api.properties['buildername']:
|
|
api.infra.update_go_deps()
|
|
update_skps_gitcookies = api.path['start_dir'].join(
|
|
UPDATE_SKPS_GITCOOKIES_FILE)
|
|
cmd = ['python',
|
|
api.vars.skia_dir.join('infra', 'bots', 'upload_skps.py'),
|
|
'--target_dir', output_dir,
|
|
'--gitcookies', str(update_skps_gitcookies)]
|
|
with DownloadGitCookies(
|
|
UPDATE_SKPS_GITCOOKIES_GS_PATH, update_skps_gitcookies, api):
|
|
with api.context(cwd=api.vars.skia_dir, env=api.infra.go_env):
|
|
api.run(api.step, 'Upload SKPs', cmd=cmd)
|
|
|
|
|
|
def GenTests(api):
|
|
builder = 'Housekeeper-Nightly-RecreateSKPs_Canary'
|
|
yield (
|
|
api.test(builder) +
|
|
api.properties(buildername=builder,
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
revision='abc123',
|
|
path_config='kitchen',
|
|
swarm_out_dir='[SWARM_OUT_DIR]') +
|
|
api.path.exists(api.path['start_dir'].join('skp_output'))
|
|
)
|
|
|
|
builder = 'Housekeeper-Weekly-RecreateSKPs'
|
|
yield (
|
|
api.test(builder) +
|
|
api.properties(buildername=builder,
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
revision='abc123',
|
|
path_config='kitchen',
|
|
swarm_out_dir='[SWARM_OUT_DIR]') +
|
|
api.path.exists(api.path['start_dir'].join('skp_output')) +
|
|
api.path.exists(api.path['start_dir'].join(UPDATE_SKPS_GITCOOKIES_FILE))
|
|
)
|
|
|
|
yield (
|
|
api.test('failed_upload') +
|
|
api.properties(buildername=builder,
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
revision='abc123',
|
|
path_config='kitchen',
|
|
swarm_out_dir='[SWARM_OUT_DIR]') +
|
|
api.path.exists(api.path['start_dir'].join('skp_output')) +
|
|
api.step_data('Upload SKPs', retcode=1)
|
|
)
|