OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
3 | 3 |
4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
7 | 7 |
8 # See master.experimental/slaves.cfg for documentation. | 8 # See master.experimental/slaves.cfg for documentation. |
9 | 9 |
10 | 10 |
11 slaves = [ | 11 slaves = [ |
12 ################################################################################ | 12 ################################################################################ |
13 # Mac | 13 # Mac |
14 ################################################################################ | 14 ################################################################################ |
15 { | 15 { |
16 'master': 'ChromiumMac', | 16 'master': 'ChromiumMac', |
17 'hostname': 'vm633-m1', | 17 'hostname': 'vm633-m1', |
18 'builder': 'Mac Builder', | 18 'builder': 'Mac Builder', |
19 'os': 'mac', | 19 'os': 'mac', |
20 'version': '10.8', | 20 'version': '10.8', |
21 'bits': '64', | 21 'bits': '64', |
22 }, | 22 }, |
23 { | 23 { |
24 'master': 'ChromiumMac', | 24 'master': 'ChromiumMac', |
25 'hostname': 'vm600-m1', | 25 'hostname': 'vm600-m1', |
26 'builder': 'Mac10.7 Tests (1)', | 26 'builder': 'Mac10.9 Tests', |
27 'os': 'mac', | 27 'os': 'mac', |
28 'version': '10.7', | 28 'version': '10.9', |
29 'bits': '64', | 29 'bits': '64', |
30 }, | 30 }, |
31 { | 31 { |
32 'master': 'ChromiumMac', | 32 'master': 'ChromiumMac', |
33 'hostname': 'vm9-a1', | 33 'hostname': 'vm9-a1', |
34 'builder': 'Mac10.6 Tests (1)', | 34 'builder': 'Mac10.6 Tests', |
35 'os': 'mac', | 35 'os': 'mac', |
36 'version': '10.6', | 36 'version': '10.6', |
37 'bits': '64', | 37 'bits': '64', |
38 }, | 38 }, |
39 { | 39 { |
40 'master': 'ChromiumMac', | 40 'master': 'ChromiumMac', |
41 'hostname': 'vm645-m1', | 41 'hostname': 'vm645-m1', |
42 'builder': 'Mac Builder (dbg)', | 42 'builder': 'Mac Builder (dbg)', |
43 'os': 'mac', | 43 'os': 'mac', |
44 'version': '10.8', | 44 'version': '10.8', |
45 'bits': '64', | 45 'bits': '64', |
46 }, | 46 }, |
47 { | 47 { |
48 'master': 'ChromiumMac', | 48 'master': 'ChromiumMac', |
49 'hostname': 'vm11-a1', | 49 'hostname': 'vm11-a1', |
50 'builder': 'Mac 10.7 Tests (dbg)(1)', | 50 'builder': 'Mac10.9 Tests (dbg)', |
51 'os': 'mac', | 51 'os': 'mac', |
52 'version': '10.7', | 52 'version': '10.9', |
53 'bits': '64', | 53 'bits': '64', |
54 }, | 54 }, |
55 { | 55 { |
56 'master': 'ChromiumMac', | 56 'master': 'ChromiumMac', |
57 'hostname': 'vm7-a1', | 57 'hostname': 'vm7-a1', |
58 'builder': 'Mac 10.6 Tests (dbg)(1)', | 58 'builder': 'Mac10.8 Tests', |
59 'os': 'mac', | 59 'os': 'mac', |
60 'version': '10.6', | 60 'version': '10.8', |
61 'bits': '64', | 61 'bits': '64', |
62 }, | 62 }, |
63 { | 63 { |
64 'master': 'ChromiumMac', | 64 'master': 'ChromiumMac', |
65 'hostname': 'mini43-a1', | 65 'hostname': 'mini43-a1', |
66 'builder': ['iOS Simulator (dbg)', 'iOS Device', 'iOS Device (ninja)',], | 66 'builder': ['iOS Simulator (dbg)', 'iOS Device', 'iOS Device (ninja)',], |
67 'os': 'mac', | 67 'os': 'mac', |
68 'version': '10.7', | 68 'version': '10.7', |
69 }, | 69 }, |
70 ] | 70 ] |
OLD | NEW |