Chromium Code Reviews| Index: scripts/slave/recipe_modules/archive/api.py |
| diff --git a/scripts/slave/recipe_modules/archive/api.py b/scripts/slave/recipe_modules/archive/api.py |
| index 584257845b34457e22ba2e82e80fb251ee30cedb..530dff119d68b3aecf7694f7daea3106e26c8250 100644 |
| --- a/scripts/slave/recipe_modules/archive/api.py |
| +++ b/scripts/slave/recipe_modules/archive/api.py |
| @@ -5,6 +5,7 @@ |
| import re |
| from recipe_engine import recipe_api |
| +from . import manual_bisect_files |
|
ghost stip (do not use)
2016/08/15 20:12:15
is that needed? can you not just do import manual_
miimnk
2016/08/15 21:41:22
Done.
|
| # TODO(machenbach): Chromium specific data should move out of the archive |
| @@ -88,11 +89,11 @@ class ArchiveApi(recipe_api.RecipeApi): |
| something other than Chromium flavor, consider using 'zip' + 'gsutil' or |
| 'isolate' modules instead. |
| """ |
| - |
| def zip_and_upload_build( |
| self, step_name, target, build_url=None, src_dir=None, |
| build_revision=None, cros_board=None, package_dsym_files=False, |
| - exclude_files=None, **kwargs): |
| + exclude_files=None, include_perf_test_files = True, |
|
ghost stip (do not use)
2016/08/15 20:12:15
nit: no spaces around =
ghost stip (do not use)
2016/08/15 20:12:15
second nit: I'd prefer to flip this flag: "exclude
miimnk
2016/08/15 21:41:22
Done.
|
| + update_properties=None, store_by_hash=True, **kwargs): |
| """Returns a step invoking zip_build.py to zip up a Chromium build. |
| If build_url is specified, also uploads the build.""" |
| if not src_dir: |
| @@ -121,6 +122,19 @@ class ArchiveApi(recipe_api.RecipeApi): |
| args.extend(['--exclude-files', exclude_files]) |
| if 'gs_acl' in self.m.properties: |
| args.extend(['--gs-acl', self.m.properties['gs_acl']]) |
| + if not include_perf_test_files: |
|
ghost stip (do not use)
2016/08/15 20:12:15
if exclude_perf_test_files: ...
|
| + inclusions = ','.join(manual_bisect_files.CHROME_REQUIRED_FILES) |
| + strip_files = ','.join(manual_bisect_files.CHROME_STRIP_LIST) |
| + args.extend(['--include-files', inclusions]) |
| + args.extend(['--ignore-regex']) |
| + args.extend(['--strip-files', strip_files]) |
| + # If update_properties is passed in and store_by_hash is False, |
| + # we store it with commit position number instead of a hash |
| + if update_properties and not store_by_hash: |
| + commit_position = self._get_commit_position( |
| + update_properties, None) |
| + cp_branch, cp_number = self.m.commit_position.parse(commit_position) |
| + args.extend(['--build_revision', cp_number]) |
| properties_json = self.m.json.dumps(self.m.properties.legacy()) |
| args.extend(['--factory-properties', properties_json, |