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 contextlib
 import copy
 import itertools
 import json
 
 from recipe_engine.types import freeze
@@ skipping 412 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 for manual bisect.
+        # (https://bugs.chromium.org/p/chromium/issues/detail?id=604452)
+        if (mastername.startswith('chromium.perf') and

[ghost stip (do not use), 2016/08/15 20:12:16]

I'm not comfortable with having an if statement gated on the mastername this
deep in the code. We should set a flag for archive_build() enabling this
behavior (perhaps something like "enable_manual_bisect"), and turn on this
behavior in the recipe itself. I believe this is done with a recipe config.
martiniss@ can help out here for the right way to do it.

[miimnk, 2016/08/15 21:41:22]

If you see recipe_modules/chromium_tests/chromium_perf.py, it contains the SPEC
for running the perf recipes. I previously added a 'bisect_builders' attribute
to the SPEC. We don't need to check the master name because we only need to
check if the SPEC for the master contains 'bisect_builders'.

I removed the "(mastername.startswith('chromium.perf'))" condition as it works
without it. 

+            master_config.get('bisect_builders') is not None and
+            buildername in master_config.get('bisect_builders')):
+          self.m.archive.zip_and_upload_build(
+              'package build for bisect',
+              self.m.chromium.c.build_config_fs,
+              build_url=self._build_bisect_gs_archive_url(master_config),
+              build_revision=build_revision,
+              cros_board=self.m.chromium.c.TARGET_CROS_BOARD,
+              update_properties=update_step.presentation.properties,
+              include_perf_test_files=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 265 matching lines @@
       path = str(path)
       assert path.startswith(relative_to)
       files[i] = path[len(relative_to):]
     return files
 
   # TODO(phajdan.jr): fix callers and remove chromium_tests.configure_swarming.
   def configure_swarming(self, project_name, precommit, mastername=None):
     return self.m.chromium_swarming.configure_swarming(  # pragma: no cover
         project_name, precommit, mastername)
 
+  def _build_bisect_gs_archive_url(self, master_config):
+    return self.m.archive.legacy_upload_url(
+        master_config.get('bisect_build_gs_bucket'),
+        extra_url_components=master_config.get('bisect_build_gs_extra'))
+
   def _build_gs_archive_url(self, mastername, master_config, buildername):
     """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':
@@ skipping 90 matching lines @@
 
     if not tests:
       return
 
     api.chromium_swarming.configure_swarming(
         'chromium', precommit=False, mastername=mastername)
     test_runner = api.chromium_tests.create_test_runner(
         api, tests, serialize_tests=bot_config.get('serialize_tests'))
     with api.chromium_tests.wrap_chromium_tests(bot_config, tests):
       test_runner()