AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update CT bots to Debian-9.2

Browse Source 
This has the side effect of using the bots in the new GCE project as
well.

Bug: skia:7278
Change-Id: Ie14c93d6e3d12ccbfb679089bc50bca482fbf605
Reviewed-on: https://skia-review.googlesource.com/76261
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Eric Boren 2017-11-29 08:36:23 -05:00 committed by Skia Commit-Bot
parent 9a9e38753a
commit 0425febe61
19 changed files with 77 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/gen_tasks.go
View File

@ -590,7 +590,7 @@ func ctSKPs(b *specs.TasksCfgBuilder, name string) string {
CipdPackages: []*specs.CipdPackage{},
Dimensions: []string{
"pool:SkiaCT",
"os:Debian-9.1",
fmt.Sprintf("os:%s", DEFAULT_OS_LINUX_GCE),
},
ExecutionTimeout: 24 * time.Hour,
ExtraArgs: []string{

2
infra/bots/recipe_modules/ct/__init__.py
View File

@ -3,7 +3,7 @@
# found in the LICENSE file.
DEPS = [
'depot_tools/gsutil',
'gsutil',
'recipe_engine/file',
'recipe_engine/path',
'recipe_engine/step',

2
infra/bots/recipe_modules/ct/api.py
View File

@ -46,7 +46,7 @@ class CTApi(recipe_api.RecipeApi):
gsutil_args.append('%s/%s/*.skp' % (str(remote_dir), i))
gsutil_args.append(str(slave_dest_dir))
try:
self.m.gsutil(gsutil_args, use_retry_wrapper=False)
self.m.gsutil('gsutil cp', *gsutil_args)
except self.m.step.StepFailure:
# Some subdirectories might have no SKPs in them.
pass

8
infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json
View File

@ -29,10 +29,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/abc123/100/*.skp",
@ -137,11 +134,10 @@
"gs://cluster-telemetry/swarming/skps/All/abc123/199/*.skp",
"[START_DIR]/skps/slave0"
],
"infra_step": true,
"name": "gsutil cp",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_EXCEPTION@@@"
"@@@STEP_FAILURE@@@"
]
},
{

6
infra/bots/recipe_modules/ct/examples/full.expected/test.json
View File

@ -29,10 +29,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/abc123/100/*.skp",
@ -137,7 +134,6 @@
"gs://cluster-telemetry/swarming/skps/All/abc123/199/*.skp",
"[START_DIR]/skps/slave0"
],
"infra_step": true,
"name": "gsutil cp"
},
{

8
infra/bots/recipe_modules/gsutil/api.py
View File

@ -8,6 +8,10 @@ from recipe_engine import recipe_api
UPLOAD_ATTEMPTS = 5
class GSUtilApi(recipe_api.RecipeApi):
def __call__(self, step_name, *args):
"""Run gsutil with the given args."""
return self.m.step(step_name, cmd=['gsutil'] + list(args))
def cp(self, name, src, dst, extra_args=None):
"""Attempt to upload or download files to/from Google Cloud Storage (GCS).
@ -20,7 +24,7 @@ class GSUtilApi(recipe_api.RecipeApi):
If the operation fails, it will be retried multiple times.
"""
cmd = ['gsutil', 'cp']
cmd = ['cp']
if extra_args:
cmd.extend(extra_args)
cmd.extend([src, dst])
@ -31,7 +35,7 @@ class GSUtilApi(recipe_api.RecipeApi):
if i > 0:
step_name += ' (attempt %d)' % (i+1)
try:
self.m.step(step_name, cmd=cmd)
self(step_name, *cmd)
break
except self.m.step.StepFailure:
if i == UPLOAD_ATTEMPTS - 1:

30
infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
View File

@ -419,10 +419,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -437,7 +434,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -499,10 +495,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -517,7 +510,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -579,10 +571,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -597,7 +586,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -659,10 +647,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -677,7 +662,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -739,10 +723,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -757,7 +738,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
View File

@ -415,10 +415,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -433,7 +430,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -495,10 +491,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -513,7 +506,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -575,10 +567,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -593,7 +582,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -655,10 +643,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -673,7 +658,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -735,10 +719,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -753,7 +734,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

30
infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
View File

@ -419,10 +419,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@ -437,7 +434,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
],
"infra_step": true,
"name": "gsutil cp"
},
{
@ -499,10 +495,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@ -517,7 +510,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
],
"infra_step": true,
"name": "gsutil cp (2)"
},
{
@ -579,10 +571,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@ -597,7 +586,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
],
"infra_step": true,
"name": "gsutil cp (3)"
},
{
@ -659,10 +647,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@ -677,7 +662,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
],
"infra_step": true,
"name": "gsutil cp (4)"
},
{
@ -739,10 +723,7 @@
},
{
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--",
"gsutil",
"-m",
"cp",
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@ -757,7 +738,6 @@
"gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
"[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
],
"infra_step": true,
"name": "gsutil cp (5)"
},
{

10
infra/bots/tasks.json
View File

@ -9063,7 +9063,7 @@
"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs": {
"dimensions": [
"pool:SkiaCT",
"os:Debian-9.1"
"os:Debian-9.2"
],
"execution_timeout_ns": 86400000000000,
"extra_args": [
@ -9086,7 +9086,7 @@
"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs": {
"dimensions": [
"pool:SkiaCT",
"os:Debian-9.1"
"os:Debian-9.2"
],
"execution_timeout_ns": 86400000000000,
"extra_args": [
@ -18476,7 +18476,7 @@
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs": {
"dimensions": [
"pool:SkiaCT",
"os:Debian-9.1"
"os:Debian-9.2"
],
"execution_timeout_ns": 86400000000000,
"extra_args": [
@ -18499,7 +18499,7 @@
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs": {
"dimensions": [
"pool:SkiaCT",
"os:Debian-9.1"
"os:Debian-9.2"
],
"execution_timeout_ns": 86400000000000,
"extra_args": [
@ -18522,7 +18522,7 @@
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs": {
"dimensions": [
"pool:SkiaCT",
"os:Debian-9.1"
"os:Debian-9.2"
],
"execution_timeout_ns": 86400000000000,
"extra_args": [