infra/bots/recipes/swarm_perf.py - Issue 2209423002: [recipes] Remove build environment vars from default_env

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: infra/bots/recipes/swarm_perf.py

Issue 2209423002: [recipes] Remove build environment vars from default_env (Closed) Base URL: https://skia.googlesource.com/skia.git@merge_buildbot_spec_fix_coverage

Patch Set: [recipes] Remove build environment vars from default_env Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« infra/bots/recipe_modules/flavor/api.py ('K') | « infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json ('k') | infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: infra/bots/recipes/swarm_perf.py

diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py

index f2ea06ce87806f605a4317a4daa8efe469e290ea..7d0d5e482a00565c266cd94dd5f35b5f00f87672 100644

--- a/infra/bots/recipes/swarm_perf.py

+++ b/infra/bots/recipes/swarm_perf.py

@@ -71,7 +71,7 @@ def perf_steps(api):

skip_flag = '--nocpu'

if skip_flag:

args.append(skip_flag)

- args.extend(api.vars.nanobench_flags)

+ args.extend(api.vars.builder_spec['nanobench_flags'])

if api.vars.upload_perf_results:

json_path = api.flavor.device_path_join(

@@ -87,8 +87,8 @@ def perf_steps(api):

args.extend([k, api.vars.builder_cfg[k]])

api.run(api.flavor.step, target, cmd=args,

- abort_on_failure=False,

- env=api.vars.default_env)

+ abort_on_failure=False,

+ env=api.vars.default_env)

# See skia:2789.

if ('Valgrind' in api.vars.builder_name and

@@ -96,9 +96,9 @@ def perf_steps(api):

abandonGpuContext = list(args)

abandonGpuContext.extend(['--abandonGpuContext', '--nocpu'])

api.run(api.flavor.step,

- '%s --abandonGpuContext' % target,

- cmd=abandonGpuContext, abort_on_failure=False,

- env=api.vars.default_env)

+ '%s --abandonGpuContext' % target,

+ cmd=abandonGpuContext, abort_on_failure=False,

+ env=api.vars.default_env)

# Copy results to swarming out dir.

if api.vars.upload_perf_results: