| 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 recipe_engine import recipe_api | 7 from recipe_engine import recipe_api |
| 8 | 8 |
| 9 | 9 |
| 10 # TODO(machenbach): Chromium specific data should move out of the archive | 10 # TODO(machenbach): Chromium specific data should move out of the archive |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 fixed_staging_dir: Use a fixed directory on the same drive rather than a | 224 fixed_staging_dir: Use a fixed directory on the same drive rather than a |
| 225 temp dir, which can lead to problems on windows. | 225 temp dir, which can lead to problems on windows. |
| 226 """ | 226 """ |
| 227 target = self.m.path.split(build_dir)[-1] | 227 target = self.m.path.split(build_dir)[-1] |
| 228 commit_position = self._get_commit_position( | 228 commit_position = self._get_commit_position( |
| 229 update_properties, primary_project) | 229 update_properties, primary_project) |
| 230 cp_branch, cp_number = self.m.commit_position.parse(commit_position) | 230 cp_branch, cp_number = self.m.commit_position.parse(commit_position) |
| 231 build_git_commit = self._get_git_commit(update_properties, primary_project) | 231 build_git_commit = self._get_git_commit(update_properties, primary_project) |
| 232 | 232 |
| 233 if fixed_staging_dir: | 233 if fixed_staging_dir: |
| 234 staging_dir = self.m.infra_paths['slave_build'].join('chrome_staging') | 234 staging_dir = self.m.path['slave_build'].join('chrome_staging') |
| 235 self.m.file.rmtree('purge staging dir', staging_dir) | 235 self.m.file.rmtree('purge staging dir', staging_dir) |
| 236 self.m.file.makedirs('create staging dir', staging_dir) | 236 self.m.file.makedirs('create staging dir', staging_dir) |
| 237 else: | 237 else: |
| 238 staging_dir = self.m.path.mkdtemp('chrome_staging') | 238 staging_dir = self.m.path.mkdtemp('chrome_staging') |
| 239 | 239 |
| 240 # Build the list of files to archive. | 240 # Build the list of files to archive. |
| 241 zip_file_list = [f for f in self.m.file.listdir('build_dir', build_dir) | 241 zip_file_list = [f for f in self.m.file.listdir('build_dir', build_dir) |
| 242 if self._cf_should_package_file(f)] | 242 if self._cf_should_package_file(f)] |
| 243 | 243 |
| 244 # Use the legacy platform name as Clusterfuzz has some expectations on | 244 # Use the legacy platform name as Clusterfuzz has some expectations on |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 'scripts', 'slave', 'archive_dependencies.py'), | 423 'scripts', 'slave', 'archive_dependencies.py'), |
| 424 ] | 424 ] |
| 425 args.extend(['--src-dir', self.m.path['checkout']]) | 425 args.extend(['--src-dir', self.m.path['checkout']]) |
| 426 args.extend(['--target', target]) | 426 args.extend(['--target', target]) |
| 427 args.extend(['--master', master]) | 427 args.extend(['--master', master]) |
| 428 args.extend(['--builder', builder]) | 428 args.extend(['--builder', builder]) |
| 429 args.extend(['--build', build]) | 429 args.extend(['--build', build]) |
| 430 self.m.python(step_name, script, args, infra_step=True, **kwargs) | 430 self.m.python(step_name, script, args, infra_step=True, **kwargs) |
| 431 except self.m.step.StepFailure: | 431 except self.m.step.StepFailure: |
| 432 pass | 432 pass |
| OLD | NEW |