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 f5fe781719417860feeb2319b48333b6e82bc493..fd380f623e6b8a8bfc624e7026eb3aeb9ce2d60f 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 perf_test_files |
| # TODO(machenbach): Chromium specific data should move out of the archive |
| @@ -101,6 +102,7 @@ class ArchiveApi(recipe_api.RecipeApi): |
| self.package_repo_resource('scripts', 'slave', 'zip_build.py'), |
| '--target', target, |
| ] |
| + |
|
dimu1
2016/07/11 17:47:09
nit: remove empty line
miimnk
2016/07/11 22:08:47
Done.
|
| if build_url or 'build_archive_url' in self.m.properties: |
| args.extend(['--build-url', |
| build_url or self.m.properties['build_archive_url']]) |
| @@ -116,6 +118,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 kwargs.pop("includePerfTestFiles", True): |
| + inclusions = ",".join(perf_test_files.FILES) |
|
stgao
2016/07/11 19:04:27
style nit: single quote instead of double quote.
miimnk
2016/07/11 22:08:47
Done.
|
| + args.extend(['--include-files', inclusions]) |
| + args.extend(['--exclusive_include']) |
| + args.extend(['--strip_symbol']) |
| + # If update_properties is passed in and store_by_hash is False, |
| + # we store it with commit position number instead of a hash |
| + update_properties = kwargs.pop("update_properties", None) |
| + if update_properties and not kwargs.pop("store_by_hash", True): |
| + 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, |