Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 # Recipe module for Skia Swarming trigger. | 6 # Recipe module for Skia Swarming trigger. |
| 7 | 7 |
| 8 | 8 |
| 9 import json | 9 import json |
| 10 | 10 |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 402 src_results_file = task.task_output_dir.join( | 402 src_results_file = task.task_output_dir.join( |
| 403 '0', 'perfdata', api.properties['buildername'], 'data', | 403 '0', 'perfdata', api.properties['buildername'], 'data', |
| 404 'nanobench_%s.json' % got_revision) | 404 'nanobench_%s.json' % got_revision) |
| 405 dst_results_file = perf_data_dir.join( | 405 dst_results_file = perf_data_dir.join( |
| 406 'nanobench_%s_%s.json' % (got_revision, git_timestamp)) | 406 'nanobench_%s_%s.json' % (got_revision, git_timestamp)) |
| 407 api.file.copy('perf_results', src_results_file, dst_results_file, | 407 api.file.copy('perf_results', src_results_file, dst_results_file, |
| 408 infra_step=True) | 408 infra_step=True) |
| 409 | 409 |
| 410 gsutil_path = api.path['slave_build'].join( | 410 gsutil_path = api.path['slave_build'].join( |
| 411 'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'third_party', | 411 'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'third_party', |
| 412 'gsutil', 'gsutil') | 412 'gsutil', 'gsutil') |
|
borenet
2016/07/29 15:34:55
If this version of gsutil doesn't work, we may hav
| |
| 413 upload_args = [api.properties['buildername'], api.properties['buildnumber'], | 413 upload_args = [api.properties['buildername'], api.properties['buildnumber'], |
| 414 perf_data_dir, got_revision, gsutil_path] | 414 perf_data_dir, got_revision, gsutil_path] |
| 415 if is_trybot: | 415 if is_trybot: |
| 416 upload_args.append(api.properties['issue']) | 416 upload_args.append(api.properties['issue']) |
| 417 api.python( | 417 api.python( |
| 418 'Upload perf results', | 418 'Upload perf results', |
| 419 script=api.skia.resource('upload_bench_results.py'), | 419 script=api.skia.resource('upload_bench_results.py'), |
| 420 args=upload_args, | 420 args=upload_args, |
| 421 cwd=api.path['checkout'], | 421 cwd=api.path['checkout'], |
| 422 env=api.skia.gsutil_env('chromium-skia-gm.boto'), | 422 # env=api.skia.gsutil_env('chromium-skia-gm.boto'), |
|
borenet
2016/07/29 15:34:55
If the trybot successfully uploads, please remove
jcgregorio
2016/07/29 16:41:58
Done.
| |
| 423 infra_step=True) | 423 infra_step=True) |
| 424 | 424 |
| 425 | 425 |
| 426 def test_steps_trigger(api, builder_spec, got_revision, infrabots_dir, | 426 def test_steps_trigger(api, builder_spec, got_revision, infrabots_dir, |
| 427 extra_hashes, cipd_packages): | 427 extra_hashes, cipd_packages): |
| 428 """Trigger DM via Swarming.""" | 428 """Trigger DM via Swarming.""" |
| 429 expiration, hard_timeout, io_timeout = get_timeouts( | 429 expiration, hard_timeout, io_timeout = get_timeouts( |
| 430 builder_spec['builder_cfg']) | 430 builder_spec['builder_cfg']) |
| 431 return trigger_task( | 431 return trigger_task( |
| 432 api, | 432 api, |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 709 test += api.path.exists(*paths) | 709 test += api.path.exists(*paths) |
| 710 | 710 |
| 711 return test | 711 return test |
| 712 | 712 |
| 713 | 713 |
| 714 def GenTests(api): | 714 def GenTests(api): |
| 715 for mastername, slaves in TEST_BUILDERS.iteritems(): | 715 for mastername, slaves in TEST_BUILDERS.iteritems(): |
| 716 for slavename, builders_by_slave in slaves.iteritems(): | 716 for slavename, builders_by_slave in slaves.iteritems(): |
| 717 for builder in builders_by_slave: | 717 for builder in builders_by_slave: |
| 718 yield test_for_bot(api, builder, mastername, slavename) | 718 yield test_for_bot(api, builder, mastername, slavename) |
| OLD | NEW |