| 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 15 matching lines...) Expand all Loading... |
| 26 if isinstance(id_element, tuple): | 26 if isinstance(id_element, tuple): |
| 27 builders.update([format % id for id in | 27 builders.update([format % id for id in |
| 28 xrange(id_element[0], id_element[1] + 1)]) | 28 xrange(id_element[0], id_element[1] + 1)]) |
| 29 else: | 29 else: |
| 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, 247, (264, 277), (207, 220), |
| 37 )) | 37 )) |
| 38 sa.AddPool('gce', *_GenerateBuilder('cros-standard%i-c2', | 38 sa.AddPool('gce', *_GenerateBuilder('cros-standard%i-c2', |
| 39 (1, 50))) | 39 (1, 50))) |
| 40 | 40 |
| 41 # Define slave classes. | 41 # Define slave classes. |
| 42 precq = sa.Alloc('precq', subtype='baremetal', pools=('baremetal',), count=32) | 42 precq = sa.Alloc('precq', subtype='baremetal', pools=('baremetal',), count=32) |
| 43 precq_novmtest = sa.Alloc('precq', subtype='gce', pools=('gce',), count=None) | 43 precq_novmtest = sa.Alloc('precq', subtype='gce', pools=('gce',), count=None) |
| 44 general = sa.Alloc('general', pools=('baremetal',), count=None) | 44 general = sa.Alloc('general', pools=('baremetal',), count=None) |
| 45 | 45 |
| 46 for builders, pools in ( | 46 for builders, pools in ( |
| 47 (chromiumos_tryserver_util.precq_builders, (precq,)), | 47 (chromiumos_tryserver_util.precq_builders, (precq,)), |
| 48 (chromiumos_tryserver_util.precq_novmtest_builders, (precq_novmtest,)), | 48 (chromiumos_tryserver_util.precq_novmtest_builders, (precq_novmtest,)), |
| 49 (chromiumos_tryserver_util.all_builders, (general,)), | 49 (chromiumos_tryserver_util.all_builders, (general,)), |
| 50 ): | 50 ): |
| 51 for builder in builders: | 51 for builder in builders: |
| 52 for pool in pools: | 52 for pool in pools: |
| 53 sa.Join(builder, pool) | 53 sa.Join(builder, pool) |
| 54 | 54 |
| 55 def _GenerateSlave(host, entry): | 55 def _GenerateSlave(host, entry): |
| 56 return { | 56 return { |
| 57 'master': 'ChromiumOSTryServer', | 57 'master': 'ChromiumOSTryServer', |
| 58 'builder': list(entry.keys), | 58 'builder': list(entry.keys), |
| 59 'hostname': host, | 59 'hostname': host, |
| 60 'os': 'linux', | 60 'os': 'linux', |
| 61 'version': 'trusty', | 61 'version': 'trusty', |
| 62 } | 62 } |
| 63 slaves = [_GenerateSlave(slave, builders) | 63 slaves = [_GenerateSlave(slave, builders) |
| 64 for slave, builders in sa.GetSlaveMap().entries.iteritems()] | 64 for slave, builders in sa.GetSlaveMap().entries.iteritems()] |
| OLD | NEW |