| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 'bits': '64', | 93 'bits': '64', |
| 94 }, | 94 }, |
| 95 { | 95 { |
| 96 'master': 'ChromiumSwarm', | 96 'master': 'ChromiumSwarm', |
| 97 'builder': 'Android deterministic build', | 97 'builder': 'Android deterministic build', |
| 98 'hostname': 'slave1-c1', | 98 'hostname': 'slave1-c1', |
| 99 'os': 'linux', | 99 'os': 'linux', |
| 100 'version': 'lucid', | 100 'version': 'lucid', |
| 101 'bits': '64', | 101 'bits': '64', |
| 102 }, | 102 }, |
| 103 { | |
| 104 'master': 'ChromiumSwarm', | |
| 105 'builder': 'IOS deterministic build', | |
| 106 'hostname': 'vm622-m1', | |
| 107 'os': 'mac', | |
| 108 'version': '10.9', | |
| 109 'bits': '64', | |
| 110 }, | |
| 111 ] | 103 ] |
| 112 | 104 |
| 113 win_slaves = [ | 105 win_slaves = [ |
| 114 { | 106 { |
| 115 'master': 'ChromiumSwarmSlaves', | 107 'master': 'ChromiumSwarmSlaves', |
| 116 'hostname': 'vm%d-m1' % i, | 108 'hostname': 'vm%d-m1' % i, |
| 117 'builder': 'win', | 109 'builder': 'win', |
| 118 'os': 'win', | 110 'os': 'win', |
| 119 'version': 'win7', | 111 'version': 'win7', |
| 120 'bits': '64', | 112 'bits': '64', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 138 'hostname': 'vm%d-m1' % i, | 130 'hostname': 'vm%d-m1' % i, |
| 139 'builder': 'mac', | 131 'builder': 'mac', |
| 140 'os': 'mac', | 132 'os': 'mac', |
| 141 'version': '10.8', | 133 'version': '10.8', |
| 142 'bits': '64', | 134 'bits': '64', |
| 143 } for i in [613, 625, 637, 639, 648] | 135 } for i in [613, 625, 637, 639, 648] |
| 144 ] | 136 ] |
| 145 | 137 |
| 146 slaves = ( | 138 slaves = ( |
| 147 heartbeat_slaves + real_slaves + win_slaves + linux_slaves + mac_vm_slaves) | 139 heartbeat_slaves + real_slaves + win_slaves + linux_slaves + mac_vm_slaves) |
| OLD | NEW |