| 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 # Full | 13 # Full |
| 14 ################################################################################ | 14 ################################################################################ |
| 15 { | 15 { |
| 16 'master': 'Chromium', | 16 'master': 'Chromium', |
| 17 'hostname': 'build11-m1', | 17 'hostname': 'build11-m1', |
| 18 'builder': 'Win', | 18 'builder': 'Win', |
| 19 'os': 'win', | 19 'os': 'win', |
| 20 'version': '2012', | 20 'version': '2012', |
| 21 'bits': '64', | 21 'bits': '64', |
| 22 }, | 22 }, |
| 23 { | 23 { |
| 24 'master': 'Chromium', | 24 'master': 'Chromium', |
| 25 'hostname': 'build61-m1', |
| 26 'builder': 'Win x64', |
| 27 'os': 'win', |
| 28 'version': '2008r2', |
| 29 'bits': '64', |
| 30 }, |
| 31 { |
| 32 'master': 'Chromium', |
| 25 'hostname': 'vm682-m1', | 33 'hostname': 'vm682-m1', |
| 26 'builder': 'Mac', | 34 'builder': 'Mac', |
| 27 'os': 'mac', | 35 'os': 'mac', |
| 28 'version': '10.8', | 36 'version': '10.8', |
| 29 'bits': '64', | 37 'bits': '64', |
| 30 }, | 38 }, |
| 31 { | 39 { |
| 32 'master': 'Chromium', | 40 'master': 'Chromium', |
| 33 'hostname': 'build48-m1', | 41 'hostname': 'build48-m1', |
| 34 'builder': 'Linux x64', | 42 'builder': 'Linux x64', |
| 35 'os': 'linux', | 43 'os': 'linux', |
| 36 'version': 'precise', | 44 'version': 'precise', |
| 37 'bits': '64', | 45 'bits': '64', |
| 38 }, | 46 }, |
| 39 { | 47 { |
| 40 'master': 'Chromium', | 48 'master': 'Chromium', |
| 41 'hostname': 'build7-m1', | 49 'hostname': 'build7-m1', |
| 42 'builder': 'Android', | 50 'builder': 'Android', |
| 43 'os': 'linux', | 51 'os': 'linux', |
| 44 'version': 'precise', | 52 'version': 'precise', |
| 45 'bits': '64', | 53 'bits': '64', |
| 46 }, | 54 }, |
| 47 ] | 55 ] |
| OLD | NEW |