| Index: scripts/slave/recipe_modules/chromium_tests/steps.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py
|
| index 1779ce4fc384643db45610ab0a93bda04a79c0a2..7a7a17525a39e1c0962f641758b309e7a950a602 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/steps.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/steps.py
|
| @@ -1140,50 +1140,50 @@ class SwarmingIsolatedScriptTest(SwarmingTest):
|
| step_result.presentation.logs['chartjson_info'] = \
|
| ['Info: Benchmark disabled, not sending results to dashboard']
|
| return
|
| + import pdb; pdb.set_trace()
|
|
|
| # TODO(eyaich): Remove logging once we debug uploading chartjson
|
| # to perf dashboard
|
| step_result.presentation.logs['chartjson_info'] = \
|
| ['Info: Setting up arguments for perf dashboard']
|
|
|
| - with api.tempfile.temp_dir('chartjson_results_output') as temp_output_dir:
|
| - filepath = temp_output_dir.join('chartjson-results.json')
|
| - api.file.write(name='write results to file',
|
| - path=filepath,
|
| - data=json.dumps(results))
|
| - """Produces a step that uploads results to dashboard"""
|
| - args = [
|
| - '--chartjson-results-file', filepath,
|
| - '--perf-id', self._perf_id,
|
| - '--results-url', self._results_url,
|
| - '--name', self._perf_dashboard_id,
|
| - '--buildername', api.properties['buildername'],
|
| - '--buildnumber', api.properties['buildnumber'],
|
| - ]
|
| - if api.chromium.c.build_dir:
|
| - args.extend(['--build-dir', api.chromium.c.build_dir])
|
| - if 'got_revision_cp' in api.properties:
|
| - args.extend(['--got-revision-cp', api.properties['got_revision_cp']])
|
| - if 'version' in api.properties:
|
| - args.extend(['--version', api.properties['version']])
|
| - if 'git_revision' in api.properties:
|
| - args.extend(['--git-revision', api.properties['git_revision']])
|
| - if 'got_webrtc_revision' in api.properties:
|
| - args.extend(['--got-webrtc-revision',
|
| - api.properties['got_webrtc_revision']])
|
| - if 'got_v8_revision' in api.properties:
|
| - args.extend(['--got-v8-revision', api.properties['got_v8_revision']])
|
| -
|
| - api.python(
|
| - 'Upload Perf Dashboard Results',
|
| - api.chromium.package_repo_resource(
|
| - 'scripts', 'slave', 'upload_perf_dashboard_results.py'),
|
| - args)
|
| + filepath = api.raw_io.input(data=json.dumps(results))
|
| + # Produces a step that uploads results to dashboard
|
| + args = [
|
| + '--chartjson-results-file', filepath,
|
| + '--perf-id', self._perf_id,
|
| + '--results-url', self._results_url,
|
| + '--name', self._perf_dashboard_id,
|
| + '--buildername', api.properties['buildername'],
|
| + '--buildnumber', api.properties['buildnumber'],
|
| + ]
|
| + print args
|
| + print self._name
|
| + if api.chromium.c.build_dir:
|
| + args.extend(['--build-dir', api.chromium.c.build_dir])
|
| + if 'got_revision_cp' in api.properties:
|
| + args.extend(['--got-revision-cp', api.properties['got_revision_cp']])
|
| + if 'version' in api.properties:
|
| + args.extend(['--version', api.properties['version']])
|
| + if 'git_revision' in api.properties:
|
| + args.extend(['--git-revision', api.properties['git_revision']])
|
| + if 'got_webrtc_revision' in api.properties:
|
| + args.extend(['--got-webrtc-revision',
|
| + api.properties['got_webrtc_revision']])
|
| + if 'got_v8_revision' in api.properties:
|
| + args.extend(['--got-v8-revision', api.properties['got_v8_revision']])
|
| +
|
| + api.python(
|
| + 'Upload Perf Dashboard Results',
|
| + api.chromium.package_repo_resource(
|
| + 'scripts', 'slave', 'upload_perf_dashboard_results.py'),
|
| + args)
|
|
|
| except Exception as e:
|
| step_result.presentation.logs['chartjson_info'].append(
|
| 'Error: Unable to upload chartjson results to perf dashboard')
|
| step_result.presentation.logs['chartjson_info'].append('%r' % e)
|
| + raise
|
|
|
|
|
| def generate_isolated_script(api, chromium_tests_api, mastername, buildername,
|
|
|