| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 contextlib | 5 import contextlib |
| 6 import copy | 6 import copy |
| 7 import json | 7 import json |
| 8 | 8 |
| 9 from infra.libs.infra_types import freeze, thaw | 9 from infra.libs.infra_types import freeze, thaw |
| 10 from slave import recipe_api | 10 from slave import recipe_api |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 }, | 199 }, |
| 200 'clang_tot_linux_asan': { | 200 'clang_tot_linux_asan': { |
| 201 'chromium_config': 'clang_tot_linux_asan', | 201 'chromium_config': 'clang_tot_linux_asan', |
| 202 'gclient_config': 'chromium', | 202 'gclient_config': 'chromium', |
| 203 }, | 203 }, |
| 204 'clang_tot_android_asan': { | 204 'clang_tot_android_asan': { |
| 205 'chromium_config': 'clang_tot_android_asan', | 205 'chromium_config': 'clang_tot_android_asan', |
| 206 'gclient_config': 'chromium', | 206 'gclient_config': 'chromium', |
| 207 'gclient_apply_config': ['android'], | 207 'gclient_apply_config': ['android'], |
| 208 }, | 208 }, |
| 209 'cast_linux': { |
| 210 'chromium_config': 'cast_linux', |
| 211 'gclient_config': 'chromium', |
| 212 }, |
| 209 }) | 213 }) |
| 210 | 214 |
| 211 | 215 |
| 212 class ChromiumTestsApi(recipe_api.RecipeApi): | 216 class ChromiumTestsApi(recipe_api.RecipeApi): |
| 213 def sync_and_configure_build(self, mastername, buildername, | 217 def sync_and_configure_build(self, mastername, buildername, |
| 214 override_bot_type=None, | 218 override_bot_type=None, |
| 215 chromium_apply_config=None): | 219 chromium_apply_config=None): |
| 216 # Make an independent copy so that we don't overwrite global state | 220 # Make an independent copy so that we don't overwrite global state |
| 217 # with updates made dynamically based on the test specs. | 221 # with updates made dynamically based on the test specs. |
| 218 master_dict = thaw(self.m.chromium.builders.get(mastername, {})) | 222 master_dict = thaw(self.m.chromium.builders.get(mastername, {})) |
| (...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 master_config.get('build_gs_bucket'), | 782 master_config.get('build_gs_bucket'), |
| 779 extra_url_components=None) | 783 extra_url_components=None) |
| 780 elif (mastername == 'tryserver.chromium.perf' or | 784 elif (mastername == 'tryserver.chromium.perf' or |
| 781 (mastername == 'tryserver.chromium.linux' and | 785 (mastername == 'tryserver.chromium.linux' and |
| 782 buildername == 'linux_full_bisect_builder')): | 786 buildername == 'linux_full_bisect_builder')): |
| 783 return None | 787 return None |
| 784 else: | 788 else: |
| 785 return self.m.archive.legacy_upload_url( | 789 return self.m.archive.legacy_upload_url( |
| 786 master_config.get('build_gs_bucket'), | 790 master_config.get('build_gs_bucket'), |
| 787 extra_url_components=self.m.properties['mastername']) | 791 extra_url_components=self.m.properties['mastername']) |
| OLD | NEW |