| 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 heartbeat_slaves = [ | 10 heartbeat_slaves = [ |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 'bits': '64', | 61 'bits': '64', |
| 62 }, | 62 }, |
| 63 { | 63 { |
| 64 'master': 'ChromiumSwarm', | 64 'master': 'ChromiumSwarm', |
| 65 'builder': 'Mac Swarm Tests (dbg)', | 65 'builder': 'Mac Swarm Tests (dbg)', |
| 66 'hostname': 'vm601-m1', | 66 'hostname': 'vm601-m1', |
| 67 'os': 'mac', | 67 'os': 'mac', |
| 68 'version': '10.8', | 68 'version': '10.8', |
| 69 'bits': '64', | 69 'bits': '64', |
| 70 }, | 70 }, |
| 71 { | |
| 72 'master': 'ChromiumSwarm', | |
| 73 'builder': 'Windows deterministic build', | |
| 74 'hostname': 'win12-c1', | |
| 75 'os': 'win', | |
| 76 'version': 'win7', | |
| 77 'bits': '64', | |
| 78 }, | |
| 79 { | |
| 80 'master': 'ChromiumSwarm', | |
| 81 'builder': 'Windows Clang deterministic build', | |
| 82 'hostname': 'win13-c1', | |
| 83 'os': 'win', | |
| 84 'version': 'win7', | |
| 85 'bits': '64', | |
| 86 }, | |
| 87 { | |
| 88 'master': 'ChromiumSwarm', | |
| 89 'builder': 'Linux deterministic build', | |
| 90 'hostname': 'slave0-c1', | |
| 91 'os': 'linux', | |
| 92 'version': 'lucid', | |
| 93 'bits': '64', | |
| 94 }, | |
| 95 { | |
| 96 'master': 'ChromiumSwarm', | |
| 97 'builder': 'Mac deterministic build', | |
| 98 'hostname': 'vm610-m1', | |
| 99 'os': 'mac', | |
| 100 'version': '10.9', | |
| 101 'bits': '64', | |
| 102 }, | |
| 103 { | |
| 104 'master': 'ChromiumSwarm', | |
| 105 'builder': 'Android deterministic build', | |
| 106 'hostname': 'slave1-c1', | |
| 107 'os': 'linux', | |
| 108 'version': 'lucid', | |
| 109 'bits': '64', | |
| 110 }, | |
| 111 ] | 71 ] |
| 112 | 72 |
| 113 win_slaves = [ | 73 win_slaves = [ |
| 114 { | 74 { |
| 115 'master': 'ChromiumSwarmSlaves', | 75 'master': 'ChromiumSwarmSlaves', |
| 116 'hostname': 'vm%d-m1' % i, | 76 'hostname': 'vm%d-m1' % i, |
| 117 'builder': 'win', | 77 'builder': 'win', |
| 118 'os': 'win', | 78 'os': 'win', |
| 119 'version': 'win7', | 79 'version': 'win7', |
| 120 'bits': '64', | 80 'bits': '64', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 138 'hostname': 'vm%d-m1' % i, | 98 'hostname': 'vm%d-m1' % i, |
| 139 'builder': 'mac', | 99 'builder': 'mac', |
| 140 'os': 'mac', | 100 'os': 'mac', |
| 141 'version': '10.8', | 101 'version': '10.8', |
| 142 'bits': '64', | 102 'bits': '64', |
| 143 } for i in [613, 625, 637, 639, 648] | 103 } for i in [613, 625, 637, 639, 648] |
| 144 ] | 104 ] |
| 145 | 105 |
| 146 slaves = ( | 106 slaves = ( |
| 147 heartbeat_slaves + real_slaves + win_slaves + linux_slaves + mac_vm_slaves) | 107 heartbeat_slaves + real_slaves + win_slaves + linux_slaves + mac_vm_slaves) |
| OLD | NEW |