a6f07c5b5c
This is a reland of 50b1248ed8
Fixes from the original are in PS2. Change several recipes to use the
shared 'is_trybot' variable, and explicitly check for 0 rather than
relying on patch_ref not being set.
Original change's description:
> Use integer patchset and issue variables.
>
> See https://skia-review.googlesource.com/c/buildbot/+/246397/
>
> Change-Id: I39dae809abdc63007f65bc05040809d1a870b118
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246302
> Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>
Change-Id: Ibe1d4f0dc1dc61c39eee6c980bd7509fc260101b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246919
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
135 lines
4.1 KiB
Python
135 lines
4.1 KiB
Python
# Copyright 2016 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 uploading DM results.
|
|
|
|
|
|
import calendar
|
|
|
|
|
|
DEPS = [
|
|
'recipe_engine/file',
|
|
'recipe_engine/json',
|
|
'recipe_engine/path',
|
|
'recipe_engine/properties',
|
|
'recipe_engine/step',
|
|
'recipe_engine/time',
|
|
'gsutil',
|
|
'vars',
|
|
]
|
|
|
|
|
|
DM_JSON = 'dm.json'
|
|
VERBOSE_LOG = 'verbose.log'
|
|
|
|
|
|
def RunSteps(api):
|
|
api.vars.setup()
|
|
revision = api.properties['revision']
|
|
|
|
results_dir = api.path['start_dir'].join('test')
|
|
|
|
# Upload the images. It is *vital* that the images are uploaded first
|
|
# so they exist whenever the json is processed.
|
|
image_dest_path = 'gs://%s/dm-images-v1' % api.properties['gs_bucket']
|
|
for ext in ['.png', '.pdf']:
|
|
files_to_upload = api.file.glob_paths(
|
|
'find %s images' % ext,
|
|
results_dir,
|
|
'*%s' % ext,
|
|
test_data=['someimage.png'])
|
|
# For some reason, glob returns results_dir when it should return nothing.
|
|
files_to_upload = [f for f in files_to_upload if str(f).endswith(ext)]
|
|
if len(files_to_upload) > 0:
|
|
api.gsutil.cp('%s images' % ext, results_dir.join('*%s' % ext),
|
|
image_dest_path, multithread=True)
|
|
|
|
# Compute the directory to upload results to
|
|
now = api.time.utcnow()
|
|
summary_dest_path = '/'.join([
|
|
'dm-json-v1',
|
|
str(now.year ).zfill(4),
|
|
str(now.month).zfill(2),
|
|
str(now.day ).zfill(2),
|
|
str(now.hour ).zfill(2),
|
|
revision,
|
|
api.vars.builder_name,
|
|
str(int(calendar.timegm(now.utctimetuple())))])
|
|
|
|
# Trybot results are further siloed by issue/patchset.
|
|
if api.vars.is_trybot:
|
|
summary_dest_path = '/'.join(('trybot', summary_dest_path,
|
|
str(api.vars.issue), str(api.vars.patchset)))
|
|
|
|
summary_dest_path = 'gs://%s/%s' % (api.properties['gs_bucket'],
|
|
summary_dest_path)
|
|
|
|
# Directly upload dm.json and verbose.log if it exists
|
|
json_file = results_dir.join(DM_JSON)
|
|
log_file = results_dir.join(VERBOSE_LOG)
|
|
|
|
api.gsutil.cp('dm.json', json_file,
|
|
summary_dest_path + '/' + DM_JSON, extra_args=['-Z'])
|
|
|
|
files = api.file.listdir('check for optional verbose.log file',
|
|
results_dir, test_data=['dm.json', 'verbose.log'])
|
|
if log_file in files:
|
|
api.gsutil.cp('verbose.log', log_file,
|
|
summary_dest_path + '/' + VERBOSE_LOG, extra_args=['-Z'])
|
|
|
|
|
|
def GenTests(api):
|
|
builder = 'Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All'
|
|
yield (
|
|
api.test('normal_bot') +
|
|
api.properties(buildername=builder,
|
|
gs_bucket='skia-infra-gm',
|
|
revision='abc123',
|
|
path_config='kitchen')
|
|
)
|
|
|
|
yield (
|
|
api.test('alternate_bucket') +
|
|
api.properties(buildername=builder,
|
|
gs_bucket='skia-infra-gm-alt',
|
|
revision='abc123',
|
|
path_config='kitchen')
|
|
)
|
|
|
|
yield (
|
|
api.test('failed_once') +
|
|
api.properties(buildername=builder,
|
|
gs_bucket='skia-infra-gm',
|
|
revision='abc123',
|
|
path_config='kitchen') +
|
|
api.step_data('upload .png images', retcode=1)
|
|
)
|
|
|
|
yield (
|
|
api.test('failed_all') +
|
|
api.properties(buildername=builder,
|
|
gs_bucket='skia-infra-gm',
|
|
revision='abc123',
|
|
path_config='kitchen') +
|
|
api.step_data('upload .png images', retcode=1) +
|
|
api.step_data('upload .png images (attempt 2)', retcode=1) +
|
|
api.step_data('upload .png images (attempt 3)', retcode=1) +
|
|
api.step_data('upload .png images (attempt 4)', retcode=1) +
|
|
api.step_data('upload .png images (attempt 5)', retcode=1)
|
|
)
|
|
|
|
yield (
|
|
api.test('trybot') +
|
|
api.properties.tryserver(
|
|
gerrit_project='skia',
|
|
gerrit_url='https://skia-review.googlesource.com/',
|
|
) +
|
|
api.properties(
|
|
buildername=builder,
|
|
gs_bucket='skia-infra-gm',
|
|
revision='abc123',
|
|
path_config='kitchen')
|
|
)
|