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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 'chromium_config': 'chromium_win_clang', | 126 'chromium_config': 'chromium_win_clang', |
127 'gclient_config': 'chromium', | 127 'gclient_config': 'chromium', |
128 }, | 128 }, |
129 'chromium_win_clang_asan': { | 129 'chromium_win_clang_asan': { |
130 'chromium_config': 'chromium_win_clang_asan', | 130 'chromium_config': 'chromium_win_clang_asan', |
131 'gclient_config': 'chromium', | 131 'gclient_config': 'chromium', |
132 }, | 132 }, |
133 'chromium_win_clang_official': { | 133 'chromium_win_clang_official': { |
134 'chromium_config': 'chromium_win_clang_official', | 134 'chromium_config': 'chromium_win_clang_official', |
135 'gclient_config': 'chromium', | 135 'gclient_config': 'chromium', |
| 136 'gclient_apply_config': ['chrome_internal'], |
136 }, | 137 }, |
137 'chromium_win_asan': { | 138 'chromium_win_asan': { |
138 'chromium_config': 'chromium_win_asan', | 139 'chromium_config': 'chromium_win_asan', |
139 'gclient_config': 'chromium', | 140 'gclient_config': 'chromium', |
140 }, | 141 }, |
141 'chromium_linux_goma_canary': { | 142 'chromium_linux_goma_canary': { |
142 'chromium_config': 'chromium', | 143 'chromium_config': 'chromium', |
143 'chromium_apply_config': ['goma_canary'], | 144 'chromium_apply_config': ['goma_canary'], |
144 'gclient_config': 'chromium', | 145 'gclient_config': 'chromium', |
145 }, | 146 }, |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
724 master_config.get('build_gs_bucket'), | 725 master_config.get('build_gs_bucket'), |
725 extra_url_components=None) | 726 extra_url_components=None) |
726 elif (mastername == 'tryserver.chromium.perf' or | 727 elif (mastername == 'tryserver.chromium.perf' or |
727 (mastername == 'tryserver.chromium.linux' and | 728 (mastername == 'tryserver.chromium.linux' and |
728 buildername == 'linux_full_bisect_builder')): | 729 buildername == 'linux_full_bisect_builder')): |
729 return None | 730 return None |
730 else: | 731 else: |
731 return self.m.archive.legacy_upload_url( | 732 return self.m.archive.legacy_upload_url( |
732 master_config.get('build_gs_bucket'), | 733 master_config.get('build_gs_bucket'), |
733 extra_url_components=self.m.properties['mastername']) | 734 extra_url_components=self.m.properties['mastername']) |
OLD | NEW |