lightweight builds archiving for mac and win64

scripts/slave/recipe_modules/archive/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 import manual_bisect_files
 from recipe_engine import recipe_api
 
 
 # TODO(machenbach): Chromium specific data should move out of the archive
@@ skipping 74 matching lines @@
   artifacts implemented as a wrapper around zip_build.py script.
 
   If you need to upload or download build artifacts (or any other files) for
   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, exclude_perf_test_files=False,
-      update_properties=None, store_by_hash=True, **kwargs):
+      update_properties=None, store_by_hash=True, 
+      include_bisect_file_list=None, include_bisect_strip_list=None,
+      include_bisect_whitelist=None, **kwargs):

[dtu, 2016/08/30 02:40:22]

This is a lot of plumbing/parameters in common code for one particular use case.
Can we push the logic about what lists to use lower down in the call chain?

[miimnk, 2016/08/30 21:14:54]

Yes. Instead, passed only platform name to get these list later in
recipe_modules/archive/api.py

     """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:
       src_dir = self.m.path['checkout']
     args = [
         '--show-path',
         'python',
         self.package_repo_resource('scripts', 'slave', 'zip_build.py'),
         '--target', target,
         '--gsutil-py-path', self.m.depot_tools.gsutil_py_path,
         '--staging-dir', self.m.path['cache'].join('chrome_staging'),
         '--src-dir', src_dir,
     ]
     if 'build_archive_url' in self.m.properties:
       args.extend(['--use-build-url-name', '--build-url',
                    self.m.properties['build_archive_url']])
     elif build_url:
       args.extend(['--build-url', build_url])
     if build_revision:
       args.extend(['--build_revision', build_revision])
     if cros_board:
       args.extend(['--cros-board', cros_board])
     if package_dsym_files:
       args.append('--package-dsym-files')
     if exclude_files:
       args.extend(['--exclude-files', exclude_files])
     if 'gs_acl' in self.m.properties:
       args.extend(['--gs-acl', self.m.properties['gs_acl']])
     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 include_bisect_file_list:
+        inclusions = ','.join(include_bisect_file_list)
+        args.extend(['--include-files', inclusions])
+      if include_bisect_strip_list:
+        strip_files = ','.join(include_bisect_strip_list)
+        args.extend(['--strip-files', strip_files])
+      if include_bisect_whitelist:
+        args.extend(['--whitelist', include_bisect_whitelist])
+      args.extend(['--not-include-extra'])
+
       # 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,
@@ skipping 285 matching lines @@
   def legacy_download_url(self, gs_bucket_name, extra_url_components=None):
     """Returns a url suitable for downloading a Chromium build from
     Google Storage.
 
     extra_url_components, if specified, should be a string without a
     trailing '/' which is inserted in the middle of the URL.
 
     The builder_name, or parent_buildername, is always automatically
     inserted into the URL."""
     return self._legacy_url(True, gs_bucket_name, extra_url_components)