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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 'reason': 'Triggered by Skia swarm_trigger Recipe', | 208 'reason': 'Triggered by Skia swarm_trigger Recipe', |
209 'revision': got_revision, | 209 'revision': got_revision, |
210 'slavename': slave, | 210 'slavename': slave, |
211 'swarm_out_dir': '${ISOLATED_OUTDIR}', | 211 'swarm_out_dir': '${ISOLATED_OUTDIR}', |
212 } | 212 } |
213 if builder_cfg['is_trybot']: | 213 if builder_cfg['is_trybot']: |
214 if api.properties.get('patch_storage') == 'gerrit': | 214 if api.properties.get('patch_storage') == 'gerrit': |
215 properties['patch_storage'] = api.properties['patch_storage'] | 215 properties['patch_storage'] = api.properties['patch_storage'] |
216 properties['repository'] = api.properties['repository'] | 216 properties['repository'] = api.properties['repository'] |
217 properties['patch_ref'] = api.properties['patch_ref'] | 217 properties['patch_ref'] = api.properties['patch_ref'] |
| 218 properties['patch_set'] = api.properties['patch_set'] |
218 properties['patch_issue'] = api.properties['patch_issue'] | 219 properties['patch_issue'] = api.properties['patch_issue'] |
219 else: | 220 else: |
220 properties['issue'] = str(api.properties['issue']) | 221 properties['issue'] = str(api.properties['issue']) |
221 properties['patchset'] = str(api.properties['patchset']) | 222 properties['patchset'] = str(api.properties['patchset']) |
222 properties['rietveld'] = api.properties['rietveld'] | 223 properties['rietveld'] = api.properties['rietveld'] |
223 | 224 |
224 extra_args = [ | 225 extra_args = [ |
225 '--workdir', '../../..', | 226 '--workdir', '../../..', |
226 recipe_name or 'swarm_%s' % task_name, | 227 recipe_name or 'swarm_%s' % task_name, |
227 ] | 228 ] |
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 path_config='kitchen', | 764 path_config='kitchen', |
764 revision='abc123', | 765 revision='abc123', |
765 **gerrit_kwargs) + | 766 **gerrit_kwargs) + |
766 api.step_data( | 767 api.step_data( |
767 'upload new .isolated file for test_skia', | 768 'upload new .isolated file for test_skia', |
768 stdout=api.raw_io.output('def456 XYZ.isolated')) + | 769 stdout=api.raw_io.output('def456 XYZ.isolated')) + |
769 api.step_data( | 770 api.step_data( |
770 'upload new .isolated file for upload_dm_results_skia', | 771 'upload new .isolated file for upload_dm_results_skia', |
771 stdout=api.raw_io.output('def456 XYZ.isolated')) | 772 stdout=api.raw_io.output('def456 XYZ.isolated')) |
772 ) | 773 ) |
OLD | NEW |