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..b82b323eb69b6a958fe9233a6cdf1c1ef5d16af2 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 |
@@ -92,7 +93,7 @@ class ArchiveApi(recipe_api.RecipeApi): |
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, includePerfTestFiles=True, update_properties = None, store_by_hash = True, **kwargs): |
dimu1
2016/07/07 21:54:11
make use of **kwargs, no need to explicitly declar
|
"""Returns a step invoking zip_build.py to zip up a Chromium build. |
If build_url is specified, also uploads the build.""" |
args = [ |
@@ -101,6 +102,7 @@ class ArchiveApi(recipe_api.RecipeApi): |
self.package_repo_resource('scripts', 'slave', 'zip_build.py'), |
'--target', target, |
] |
+ |
if build_url or 'build_archive_url' in self.m.properties: |
args.extend(['--build-url', |
build_url or self.m.properties['build_archive_url']]) |
@@ -114,8 +116,20 @@ class ArchiveApi(recipe_api.RecipeApi): |
args.append('--package-dsym-files') |
if exclude_files: |
args.extend(['--exclude-files', exclude_files]) |
+ if not includePerfTestFiles: |
+ args.extend(['--strip_symbol']) |
if 'gs_acl' in self.m.properties: |
args.extend(['--gs-acl', self.m.properties['gs_acl']]) |
+ if not includePerfTestFiles: |
dimu1
2016/07/07 21:54:11
merge this block with the previous if block in lin
|
+ inclusions = ",".join(perf_test_files.FILES) |
+ args.extend(['--include-files', inclusions]) |
+ args.extend(['--exclusive_include']) |
+ # If update_properties is passed in and store_by_hash is False, we store it with commit position number instead of a hash |
dimu1
2016/07/07 21:54:11
nit: 80 words
|
+ 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, |