OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 import re | 5 import re |
6 | 6 |
7 from slave import recipe_api | 7 from slave import recipe_api |
8 | 8 |
9 | 9 |
10 # Regular expression to identify a Git hash. | 10 # Regular expression to identify a Git hash. |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 """ | 202 """ |
203 target = self.m.path.split(build_dir)[-1] | 203 target = self.m.path.split(build_dir)[-1] |
204 commit_position = self._get_commit_position( | 204 commit_position = self._get_commit_position( |
205 update_properties, primary_project) | 205 update_properties, primary_project) |
206 cp_branch, cp_number = self.m.commit_position.parse(commit_position) | 206 cp_branch, cp_number = self.m.commit_position.parse(commit_position) |
207 build_git_commit = self._get_git_commit(update_properties, primary_project) | 207 build_git_commit = self._get_git_commit(update_properties, primary_project) |
208 | 208 |
209 staging_dir = self.m.path['slave_build'].join('chrome_staging') | 209 staging_dir = self.m.path['slave_build'].join('chrome_staging') |
210 | 210 |
211 # Build the list of files to archive. | 211 # Build the list of files to archive. |
212 zip_file_list = [f for f in self.m.path.listdir('build_dir', build_dir) | 212 zip_file_list = [f for f in self.m.file.listdir('build_dir', build_dir) |
213 if self._cf_should_package_file(f)] | 213 if self._cf_should_package_file(f)] |
214 | 214 |
215 pieces = [self.m.platform.name, target.lower()] | 215 pieces = [self.m.platform.name, target.lower()] |
216 if archive_subdir_suffix: | 216 if archive_subdir_suffix: |
217 pieces.append(archive_subdir_suffix) | 217 pieces.append(archive_subdir_suffix) |
218 subdir = '-'.join(pieces) | 218 subdir = '-'.join(pieces) |
219 | 219 |
220 # Components like v8 get a <name>-v8-component-<revision> infix. | 220 # Components like v8 get a <name>-v8-component-<revision> infix. |
221 component = '' | 221 component = '' |
222 if revision_dir: | 222 if revision_dir: |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 'archive_dependencies.py') | 359 'archive_dependencies.py') |
360 args = [] | 360 args = [] |
361 args.extend(['--src-dir', self.m.path['checkout']]) | 361 args.extend(['--src-dir', self.m.path['checkout']]) |
362 args.extend(['--target', target]) | 362 args.extend(['--target', target]) |
363 args.extend(['--master', master]) | 363 args.extend(['--master', master]) |
364 args.extend(['--builder', builder]) | 364 args.extend(['--builder', builder]) |
365 args.extend(['--build', build]) | 365 args.extend(['--build', build]) |
366 self.m.python(step_name, script, args, infra_step=True, **kwargs) | 366 self.m.python(step_name, script, args, infra_step=True, **kwargs) |
367 except self.m.step.StepFailure: | 367 except self.m.step.StepFailure: |
368 pass | 368 pass |
OLD | NEW |