| 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 os | 9 import os |
| 10 import json | 10 import json |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 api.properties['mastername'], | 466 api.properties['mastername'], |
| 467 api.properties['slavename'], | 467 api.properties['slavename'], |
| 468 api.properties['buildnumber'], | 468 api.properties['buildnumber'], |
| 469 builder_cfg, | 469 builder_cfg, |
| 470 got_revision, | 470 got_revision, |
| 471 infrabots_dir, | 471 infrabots_dir, |
| 472 extra_isolate_hashes=extra_hashes, | 472 extra_isolate_hashes=extra_hashes, |
| 473 expiration=expiration, | 473 expiration=expiration, |
| 474 hard_timeout=hard_timeout, | 474 hard_timeout=hard_timeout, |
| 475 io_timeout=io_timeout, | 475 io_timeout=io_timeout, |
| 476 cipd_packages=cipd_packages) | 476 cipd_packages=cipd_packages, |
| 477 store_output=False) |
| 477 | 478 |
| 478 | 479 |
| 479 def perf_steps_collect(api, task, builder_cfg, got_revision, infrabots_dir): | 480 def perf_steps_collect(api, task, builder_cfg, got_revision, infrabots_dir): |
| 480 """Wait for perf steps to finish and upload results.""" | 481 """Wait for perf steps to finish and upload results.""" |
| 481 # Wait for nanobench to finish, download the results. | 482 # Wait for nanobench to finish, download the results. |
| 482 api.run.rmtree(task.task_output_dir) | |
| 483 if not api.vars.upload_perf_results: # pragma: nocover | 483 if not api.vars.upload_perf_results: # pragma: nocover |
| 484 api.swarming.collect_swarming_task(task) | 484 api.swarming.collect_swarming_task(task) |
| 485 return | 485 return |
| 486 | 486 |
| 487 perf_hash = api.swarming.collect_swarming_task_isolate_hash(task) | 487 perf_hash = api.swarming.collect_swarming_task_isolate_hash(task) |
| 488 | 488 |
| 489 # Upload the results. | 489 # Upload the results. |
| 490 task = trigger_task( | 490 task = trigger_task( |
| 491 api, | 491 api, |
| 492 'upload_nano_results', | 492 'upload_nano_results', |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 mastername='client.skia', | 825 mastername='client.skia', |
| 826 slavename='skiabot-linux-swarm-000', | 826 slavename='skiabot-linux-swarm-000', |
| 827 buildnumber=5, | 827 buildnumber=5, |
| 828 path_config='kitchen', | 828 path_config='kitchen', |
| 829 revision='abc123', | 829 revision='abc123', |
| 830 **gerrit_kwargs) + | 830 **gerrit_kwargs) + |
| 831 api.step_data( | 831 api.step_data( |
| 832 'upload new .isolated file for test_skia', | 832 'upload new .isolated file for test_skia', |
| 833 stdout=api.raw_io.output('def456 XYZ.isolated')) | 833 stdout=api.raw_io.output('def456 XYZ.isolated')) |
| 834 ) | 834 ) |
| OLD | NEW |