| 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 import chromiumos_tryserver_util | 10 import chromiumos_tryserver_util |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 builders.add(format % id_element) | 30 builders.add(format % id_element) |
| 31 return builders | 31 return builders |
| 32 | 32 |
| 33 | 33 |
| 34 sa = slave_alloc.SlaveAllocator() | 34 sa = slave_alloc.SlaveAllocator() |
| 35 sa.AddPool('baremetal', *_GenerateBuilder('build%i-m2', | 35 sa.AddPool('baremetal', *_GenerateBuilder('build%i-m2', |
| 36 (222,233), (238, 242), 244, (264, 277), (207, 220), | 36 (222,233), (238, 242), 244, (264, 277), (207, 220), |
| 37 )) | 37 )) |
| 38 sa.AddPool('gce', *_GenerateBuilder('cros%i-c2', | 38 sa.AddPool('gce', *_GenerateBuilder('cros%i-c2', |
| 39 (1, 50))) | 39 (1, 50))) |
| 40 sa.AddPool('gce_testing', *_GenerateBuilder('cros-testing%i-c2', | 40 sa.AddPool('gce_testing', 'cros80-c2', *_GenerateBuilder('cros-testing%i-c2', |
| 41 (1, 10))) | 41 (1, 10))) |
| 42 | 42 |
| 43 # Define slave classes. | 43 # Define slave classes. |
| 44 precq = sa.Alloc('precq', subtype='baremetal', pools=('baremetal',), count=32) | 44 precq = sa.Alloc('precq', subtype='baremetal', pools=('baremetal',), count=32) |
| 45 precq_novmtest = sa.Alloc('precq', subtype='gce', pools=('gce',), count=None) | 45 precq_novmtest = sa.Alloc('precq', subtype='gce', pools=('gce',), count=None) |
| 46 general = sa.Alloc('general', pools=('baremetal',), count=None) | 46 general = sa.Alloc('general', pools=('baremetal',), count=None) |
| 47 gce_testing = sa.Alloc('testing', subtype='gce', pools=('gce_testing',), | 47 gce_testing = sa.Alloc('testing', subtype='gce', pools=('gce_testing',), |
| 48 count=None) | 48 count=None) |
| 49 | 49 |
| 50 for builders, pools in ( | 50 for builders, pools in ( |
| 51 (chromiumos_tryserver_util.precq_builders, (precq,)), | 51 (chromiumos_tryserver_util.precq_builders, (precq,)), |
| 52 (chromiumos_tryserver_util.precq_novmtest_builders, (precq_novmtest,)), | 52 (chromiumos_tryserver_util.precq_novmtest_builders, (precq_novmtest,)), |
| 53 (chromiumos_tryserver_util.all_builders, (general, gce_testing)), | 53 (chromiumos_tryserver_util.all_builders, (general, gce_testing)), |
| 54 ): | 54 ): |
| 55 for builder in builders: | 55 for builder in builders: |
| 56 for pool in pools: | 56 for pool in pools: |
| 57 sa.Join(builder, pool) | 57 sa.Join(builder, pool) |
| 58 | 58 |
| 59 def _GenerateSlave(host, entry): | 59 def _GenerateSlave(host, entry): |
| 60 testing = gce_testing in entry.classes | 60 testing = gce_testing in entry.classes |
| 61 return { | 61 return { |
| 62 'master': 'ChromiumOSTryServer', | 62 'master': 'ChromiumOSTryServer', |
| 63 'builder': list(entry.keys), | 63 'builder': list(entry.keys), |
| 64 'hostname': host, | 64 'hostname': host, |
| 65 'os': 'linux', | 65 'os': 'linux', |
| 66 'version': 'precise' if not testing else 'testing', | 66 'version': 'precise' if not testing else 'testing', |
| 67 } | 67 } |
| 68 slaves = [_GenerateSlave(slave, builders) | 68 slaves = [_GenerateSlave(slave, builders) |
| 69 for slave, builders in sa.GetSlaveMap().entries.iteritems()] | 69 for slave, builders in sa.GetSlaveMap().entries.iteritems()] |
| OLD | NEW |