Archive Linux perf builds for manual bisect

scripts/slave/recipe_modules/chromium_tests/api.py

 # Copyright 2014 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 collections
 import contextlib
 import copy
 import itertools
 import json
 
@@ skipping 194 matching lines @@
     bot_db = bdb_module.BotConfigAndTestDB()
     bot_db._add_master_dict_and_test_spec(mastername, master_dict, {})
     return bot_db
 
   def prepare_checkout(self, bot_config, root_solution_revision=None,
                        force=False):
     update_step = self.ensure_checkout(
         bot_config, root_solution_revision, force=force)
 
     if (self.m.chromium.c.compile_py.compiler and
-        'goma' in self.m.chromium.c.compile_py.compiler):
+       'goma' in self.m.chromium.c.compile_py.compiler):
       self.m.chromium.ensure_goma(canary=bot_config.get('goma_canary', False))
 
     self.set_up_swarming(bot_config)
     self.runhooks(update_step)
 
     bot_db = bdb_module.BotConfigAndTestDB()
     bot_config.initialize_bot_db(self, bot_db, update_step)
 
     if self.m.chromium.c.lto and \
         not self.m.chromium.c.env.LLVM_FORCE_HEAD_REVISION:
@@ skipping 173 matching lines @@
             verbose=True,
             set_swarm_hashes=False)
 
   def archive_build(self, mastername, buildername, update_step, bot_db):
     bot_config = bot_db.get_bot_config(mastername, buildername)
 
     if bot_config.get('bot_type') == 'builder':
       if not bot_config.get('cf_archive_build'):
         master_config = bot_db.get_master_settings(mastername)
         build_revision = update_step.presentation.properties['got_revision']
+
+        # For archiving 'chromium.perf', the builder also archives a version 
+        # without perf test files.
+        if mastername.startswith('chromium.perf'):
+          self.m.archive.zip_and_upload_build(
+              'package build',

[stgao, 2016/07/11 19:04:27]

This seems to add a new step, should we make a new name for it to avoid conflict
with line #430 below?

[miimnk, 2016/07/11 22:08:47]

How about if we name it to 'package build bisect'. 

+              self.m.chromium.c.build_config_fs,
+              build_url=self._build_gs_archive_url(
+                  mastername, master_config, buildername, strip_symbol = True),
+              build_revision=build_revision,
+              cros_board=self.m.chromium.c.TARGET_CROS_BOARD,
+              # TODO(machenbach): Make asan a configuration switch.

[stgao, 2016/07/11 19:04:27]

What's this for?

[miimnk, 2016/07/11 22:08:47]

I essentially copied and pasted the self.m.archive.zip_and_upload_build from the
below and changed gs archive url and additionally included a few required
parameters. It seems that 'package_dsym_files' is only related to 'mac', so I
will remove this since we are currently only archiving for Linux. 

+              package_dsym_files=(
+                  self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan') and
+                  self.m.chromium.c.HOST_PLATFORM == 'mac'),
+              update_properties=update_step.presentation.properties,
+              includePerfTestFiles=False,
+              store_by_hash=False
+          )
+
         self.m.archive.zip_and_upload_build(
             'package build',
             self.m.chromium.c.build_config_fs,
             build_url=self._build_gs_archive_url(
                 mastername, master_config, buildername),
             build_revision=build_revision,
             cros_board=self.m.chromium.c.TARGET_CROS_BOARD,
             # TODO(machenbach): Make asan a configuration switch.
             package_dsym_files=(
                 self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan') and
@@ skipping 48 matching lines @@
                              isolated_targets=isolated_targets,
                              name='generate_build_files%s' % name_suffix)
 
     self.m.chromium.compile(compile_targets, name='compile%s' % name_suffix)
 
   def download_and_unzip_build(self, mastername, buildername, update_step,
                                bot_db, build_archive_url=None,
                                build_revision=None, override_bot_type=None):
     assert isinstance(bot_db, bdb_module.BotConfigAndTestDB), \
         "bot_db argument %r was not a BotConfigAndTestDB" % (bot_db)
+
     # We only want to do this for tester bots (i.e. those which do not compile
     # locally).
     bot_type = override_bot_type or bot_db.get_bot_config(
         mastername, buildername).get('bot_type')
     if bot_type != 'tester':
       return
 
     # Protect against hard to debug mismatches between directory names
     # used to run tests from and extract build to. We've had several cases
     # where a stale build directory was used on a tester, and the extracted
@@ skipping 268 matching lines @@
       self.m.swarming.default_user = requester
 
       patch_project = self.m.properties.get('patch_project')
       if patch_project:
         self.m.swarming.add_default_tag('patch_project:%s' % patch_project)
     else:
       self.m.swarming.default_priority = MASTER_SWARMING_PRIORITIES[mastername]
       self.m.swarming.add_default_tag('purpose:post-commit')
       self.m.swarming.add_default_tag('purpose:CI')
 
-  def _build_gs_archive_url(self, mastername, master_config, buildername):
+  def _build_gs_archive_url(self, mastername, master_config, buildername, strip_symbol = False):
     """Returns the archive URL to pass to self.m.archive.zip_and_upload_build.
 
     Most builders on most masters use a standard format for the build archive
     URL, but some builders on some masters may specify custom places to upload
     builds to. These special cases include:
       'chromium.perf' or 'chromium.perf.fyi':
         Exclude the name of the master from the url.
       'tryserver.chromium.perf', or
           linux_full_bisect_builder on 'tryserver.chromium.linux':
         Return None so that the archive url specified in factory_properties
         (as set on the master's configuration) is used instead.
     """
     if mastername.startswith('chromium.perf'):
+      if strip_symbol:
+        return self.m.archive.legacy_upload_url(
+          master_config.get('bisect_build_gs_bucket'),
+          extra_url_components=None)
       return self.m.archive.legacy_upload_url(
           master_config.get('build_gs_bucket'),
           extra_url_components=None)
     elif (mastername == 'tryserver.chromium.perf' or
           (mastername == 'tryserver.chromium.linux' and
            buildername == 'linux_full_bisect_builder')):
       return None
     else:
       return self.m.archive.legacy_upload_url(
           master_config.get('build_gs_bucket'),
@@ skipping 40 matching lines @@
   def get_compile_targets_for_scripts(self):
     return self.m.python(
         name='get compile targets for scripts',
         script=self.m.path['checkout'].join(
             'testing', 'scripts', 'get_compile_targets.py'),
         args=[
             '--output', self.m.json.output(),
             '--',
         ] + self.get_common_args_for_scripts(),
         step_test_data=lambda: self.m.json.test_api.output({}))