| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright 2015 The Chromium Authors. All rights reserved. | 4 # Copyright 2015 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 linux_slave_builder_map = { | 8 linux_slave_builder_map = { |
| 9 '44': ['linux', 'linux_shared', 'linux32', 'linux_noasm_asan', 'linux_small', | 9 '44': ['linux', 'linux_shared', 'linux32', 'linux_noasm_asan', 'linux_small', |
| 10 'docs'], | 10 'linux_nothreads', 'docs'], |
| 11 } | 11 } |
| 12 | 12 |
| 13 win_slave_builder_map = { | 13 win_slave_builder_map = { |
| 14 '131': ['win64', 'win64_small', 'win32', 'win32_small'], | 14 '131': ['win64', 'win64_small', 'win32', 'win32_small'], |
| 15 } | 15 } |
| 16 | 16 |
| 17 mac_slave_builder_map = { | 17 mac_slave_builder_map = { |
| 18 '2': ['mac', 'mac_small'], | 18 '2': ['mac', 'mac_small'], |
| 19 } | 19 } |
| 20 | 20 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 46 'master': 'Boringssl', | 46 'master': 'Boringssl', |
| 47 'builder': builders, | 47 'builder': builders, |
| 48 'hostname': 'vm%s-m3' % host, | 48 'hostname': 'vm%s-m3' % host, |
| 49 'os': 'mac', | 49 'os': 'mac', |
| 50 'version': '10.9', | 50 'version': '10.9', |
| 51 'bits': '64', | 51 'bits': '64', |
| 52 } for host, builders in mac_slave_builder_map.iteritems() | 52 } for host, builders in mac_slave_builder_map.iteritems() |
| 53 ] | 53 ] |
| 54 | 54 |
| 55 slaves = linux_slaves + win_slaves + mac_slaves | 55 slaves = linux_slaves + win_slaves + mac_slaves |
| OLD | NEW |