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 from . import perf_test_files | |
8 | 9 |
9 | 10 |
10 # TODO(machenbach): Chromium specific data should move out of the archive | 11 # TODO(machenbach): Chromium specific data should move out of the archive |
11 # module, into e.g. the chromium test configs. | 12 # module, into e.g. the chromium test configs. |
12 EXCLUDED_FILES_ALL_PLATFORMS = [ | 13 EXCLUDED_FILES_ALL_PLATFORMS = [ |
13 '.landmines', | 14 '.landmines', |
14 '.ninja_deps', | 15 '.ninja_deps', |
15 '.ninja_log', | 16 '.ninja_log', |
16 'gen', | 17 'gen', |
17 'obj', | 18 'obj', |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
109 elif src_dir: | 110 elif src_dir: |
110 args.extend(['--src-dir', src_dir]) | 111 args.extend(['--src-dir', src_dir]) |
111 if cros_board: | 112 if cros_board: |
112 args.extend(['--cros-board', cros_board]) | 113 args.extend(['--cros-board', cros_board]) |
113 if package_dsym_files: | 114 if package_dsym_files: |
114 args.append('--package-dsym-files') | 115 args.append('--package-dsym-files') |
115 if exclude_files: | 116 if exclude_files: |
116 args.extend(['--exclude-files', exclude_files]) | 117 args.extend(['--exclude-files', exclude_files]) |
117 if 'gs_acl' in self.m.properties: | 118 if 'gs_acl' in self.m.properties: |
118 args.extend(['--gs-acl', self.m.properties['gs_acl']]) | 119 args.extend(['--gs-acl', self.m.properties['gs_acl']]) |
120 if not kwargs.pop("includePerfTestFiles", True): | |
dtu
2016/08/05 21:06:18
style nit: argument/variable names are always lowe
miimnk
2016/08/08 22:41:23
Fixed the variable name with lowercase_with_unders
| |
121 inclusions = ','.join(perf_test_files.CHROME_REQUIRED_FILES) | |
122 strip_files = ','.join(perf_test_files.CHROME_STRIP_LIST) | |
123 args.extend(['--include-files', inclusions]) | |
124 args.extend(['--ignore_regex']) | |
125 args.extend(['--strip_files', strip_files]) | |
126 # If update_properties is passed in and store_by_hash is False, | |
127 # we store it with commit position number instead of a hash | |
128 update_properties = kwargs.pop("update_properties", None) | |
129 if update_properties and not kwargs.pop("store_by_hash", True): | |
130 commit_position = self._get_commit_position( | |
131 update_properties, None) | |
132 cp_branch, cp_number = self.m.commit_position.parse(commit_position) | |
133 args.extend(['--build_revision', cp_number]) | |
119 | 134 |
120 properties_json = self.m.json.dumps(self.m.properties.legacy()) | 135 properties_json = self.m.json.dumps(self.m.properties.legacy()) |
121 args.extend(['--factory-properties', properties_json, | 136 args.extend(['--factory-properties', properties_json, |
122 '--build-properties', properties_json]) | 137 '--build-properties', properties_json]) |
123 | 138 |
124 kwargs['allow_subannotations'] = True | 139 kwargs['allow_subannotations'] = True |
125 self.m.python( | 140 self.m.python( |
126 step_name, | 141 step_name, |
127 self.package_repo_resource('scripts', 'tools', 'runit.py'), | 142 self.package_repo_resource('scripts', 'tools', 'runit.py'), |
128 args, | 143 args, |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
402 def legacy_download_url(self, gs_bucket_name, extra_url_components=None): | 417 def legacy_download_url(self, gs_bucket_name, extra_url_components=None): |
403 """Returns a url suitable for downloading a Chromium build from | 418 """Returns a url suitable for downloading a Chromium build from |
404 Google Storage. | 419 Google Storage. |
405 | 420 |
406 extra_url_components, if specified, should be a string without a | 421 extra_url_components, if specified, should be a string without a |
407 trailing '/' which is inserted in the middle of the URL. | 422 trailing '/' which is inserted in the middle of the URL. |
408 | 423 |
409 The builder_name, or parent_buildername, is always automatically | 424 The builder_name, or parent_buildername, is always automatically |
410 inserted into the URL.""" | 425 inserted into the URL.""" |
411 return self._legacy_url(True, gs_bucket_name, extra_url_components) | 426 return self._legacy_url(True, gs_bucket_name, extra_url_components) |
OLD | NEW |