OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 slaves = [ | 5 slaves = [ |
6 # Linux 32-bit. | 6 # Linux 32-bit. |
7 { | 7 { |
8 'master': 'WebRTC', | 8 'master': 'WebRTC', |
9 'os': 'linux', | 9 'os': 'linux', |
10 'version': 'precise', | 10 'version': 'precise', |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
114 'builder': [ | 114 'builder': [ |
115 'Android64 Tests (L Nexus9)', | 115 'Android64 Tests (L Nexus9)', |
116 ], | 116 ], |
117 'hostname': 'build34-a3', | 117 'hostname': 'build34-a3', |
118 }, | 118 }, |
119 ] + [ | 119 ] + [ |
120 # Mac. | 120 # Mac. |
121 { | 121 { |
122 'master': 'WebRTC', | 122 'master': 'WebRTC', |
123 'os': 'mac', | 123 'os': 'mac', |
124 'version': '10.8', | 124 'version': '10.10', |
125 'bits': '64', | 125 'bits': '64', |
126 'builder': [ | 126 'builder': [ |
127 'iOS32 Debug', | 127 'iOS32 Debug', |
128 'iOS32 Release', | 128 'iOS32 Release', |
129 'iOS64 Debug', | 129 'iOS64 Debug', |
130 'iOS64 Release', | 130 'iOS64 Release', |
131 'iOS32 Simulator Debug', | 131 'iOS32 Simulator Debug', |
132 'iOS64 Simulator Debug', | 132 'iOS64 Simulator Debug', |
133 'Mac32 Debug', | 133 'Mac32 Debug', |
134 'Mac32 Release', | 134 'Mac32 Release', |
135 'Mac64 Debug', | 135 'Mac64 Debug', |
136 'Mac64 Release', | 136 'Mac64 Release', |
137 'Mac64 Debug (GN)', | 137 'Mac64 Debug (GN)', |
138 'Mac64 Release (GN)', | 138 'Mac64 Release (GN)', |
139 'Mac Asan', | 139 'Mac Asan', |
140 ], | 140 ], |
141 'hostname': 'vm%d-m3' % i, | 141 'hostname': 'vm%d-m3' % i, |
142 } for i in range(672, 674) + [612, 677] | 142 } for i in range(672, 675) + [612, 677] |
phoglund_chromium
2015/11/16 09:36:54
Where did you move 675 from? Is that the one you m
kjellander_chromium
2015/11/16 09:45:12
This change only adds 674 (from masters/master.cli
phoglund_chromium
2015/11/16 10:16:42
Ok, just checking.
| |
143 ] + [ | 143 ] + [ |
144 # Mac, bare-metal. | 144 # Mac, bare-metal. |
145 { | 145 { |
146 'master': 'WebRTC', | 146 'master': 'WebRTC', |
147 'os': 'mac', | 147 'os': 'mac', |
148 'version': '10.8', | 148 'version': '10.10', |
149 'bits': '64', | 149 'bits': '64', |
150 'builder': [ | 150 'builder': [ |
151 'Mac32 Release [large tests]', | 151 'Mac32 Release [large tests]', |
152 ], | 152 ], |
153 'hostname': 'build23-a3', | 153 'hostname': 'build23-a3', |
154 }, | 154 }, |
155 ] + [ | 155 ] + [ |
156 # Windows. | 156 # Windows. |
157 { | 157 { |
158 'master': 'WebRTC', | 158 'master': 'WebRTC', |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
197 'master': 'WebRTC', | 197 'master': 'WebRTC', |
198 'os': 'win', | 198 'os': 'win', |
199 'version': 'win7', | 199 'version': 'win7', |
200 'bits': '64', | 200 'bits': '64', |
201 'builder': [ | 201 'builder': [ |
202 'Win32 Release [large tests]', | 202 'Win32 Release [large tests]', |
203 ], | 203 ], |
204 'hostname': 'chromeperf90', | 204 'hostname': 'chromeperf90', |
205 } | 205 } |
206 ] | 206 ] |
OLD | NEW |