Revert of Changed sequence of package_build step

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 422 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']
-        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
-                self.m.chromium.c.HOST_PLATFORM == 'mac'),
-        )
 
         # 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 (master_config.get('bisect_builders') 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,
               exclude_perf_test_files=True,
               store_by_hash=False,
               platform=self.m.chromium.c.HOST_PLATFORM
           )
 
+        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
+                self.m.chromium.c.HOST_PLATFORM == 'mac'),
+        )
+
       trigger_specs = []
       for loop_mastername, loop_buildername, builder_dict in sorted(
           bot_db.bot_configs_matching_parent_buildername(
               mastername, buildername)):
         trigger_spec = {
             'builder_name': loop_buildername,
             'properties': {},
         }
         if mastername != loop_mastername:
           trigger_spec['bucket'] = 'master.' + loop_mastername
@@ skipping 532 matching lines @@
     targets in |compile_targets|."""
     result = []
     for test in tests:
       test_compile_targets = test.compile_targets(api)
       # Always return tests that don't require compile. Otherwise we'd never
       # run them.
       if ((set(compile_targets) & set(test_compile_targets)) or
           not test_compile_targets):
         result.append(test)
     return result