| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # See master.experimental/slaves.cfg for documentation. | 7 # See master.experimental/slaves.cfg for documentation. |
| 8 | 8 |
| 9 | 9 |
| 10 def linux(): | 10 def linux(): |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 'master': 'TryServer', | 138 'master': 'TryServer', |
| 139 # We can also add 'win' to the list of builders but let's not take risks | 139 # We can also add 'win' to the list of builders but let's not take risks |
| 140 # as this is the only Win7 tryslave now. | 140 # as this is the only Win7 tryslave now. |
| 141 'builder': ['win_drmemory'], | 141 'builder': ['win_drmemory'], |
| 142 'hostname': 'vm%d-m4' % i, | 142 'hostname': 'vm%d-m4' % i, |
| 143 'os': 'win', | 143 'os': 'win', |
| 144 'version': 'win7', | 144 'version': 'win7', |
| 145 'bits': '64', | 145 'bits': '64', |
| 146 } for i in (120,) | 146 } for i in (120,) |
| 147 ] | 147 ] |
| 148 return normal_slaves + layout_slaves + drmemory_slaves | 148 chromeframe_slave = [ |
| 149 { |
| 150 'master': 'TryServer', |
| 151 'builder': ['win_cf'], |
| 152 'hostname': 'vm177-m4', # Custom slave that runs IE8 instead of IE9. |
| 153 'os': 'win', |
| 154 'version': 'win7', |
| 155 'bits': '64', |
| 156 } |
| 157 ] |
| 158 return normal_slaves + layout_slaves + drmemory_slaves + chromeframe_slave |
| 149 | 159 |
| 150 | 160 |
| 151 def cros(): | 161 def cros(): |
| 152 return [ | 162 return [ |
| 153 # vms that are set up with chromiumOS depends | 163 # vms that are set up with chromiumOS depends |
| 154 { | 164 { |
| 155 'master': 'TryServer', | 165 'master': 'TryServer', |
| 156 'builder': ['cros_arm', 'cros_tegra2'], | 166 'builder': ['cros_arm', 'cros_tegra2'], |
| 157 'hostname': 'vm%d-m4' % i, | 167 'hostname': 'vm%d-m4' % i, |
| 158 'os': 'linux', | 168 'os': 'linux', |
| (...skipping 19 matching lines...) Expand all Loading... |
| 178 'master': 'TryServer', | 188 'master': 'TryServer', |
| 179 'builder': ['android'], | 189 'builder': ['android'], |
| 180 'hostname': 'vm176-m4', | 190 'hostname': 'vm176-m4', |
| 181 'os': 'linux', | 191 'os': 'linux', |
| 182 'version': 'lucid', | 192 'version': 'lucid', |
| 183 'bits': '64', | 193 'bits': '64', |
| 184 } | 194 } |
| 185 ] | 195 ] |
| 186 | 196 |
| 187 slaves = linux() + mac() + windows() + cros() + android() | 197 slaves = linux() + mac() + windows() + cros() + android() |
| OLD | NEW |