| Index: masters/master.chromiumos.tryserver/slaves.cfg
|
| diff --git a/masters/master.chromiumos.tryserver/slaves.cfg b/masters/master.chromiumos.tryserver/slaves.cfg
|
| index 37bd1dd81fa4eda18584fa2ac6aa3ffa282cfc45..4ce1f5aee0623250a9055d0cbfcc369f11a80e0f 100644
|
| --- a/masters/master.chromiumos.tryserver/slaves.cfg
|
| +++ b/masters/master.chromiumos.tryserver/slaves.cfg
|
| @@ -37,33 +37,28 @@ sa.AddPool('baremetal', *_GenerateBuilder('build%i-m2',
|
| ))
|
| sa.AddPool('gce', *_GenerateBuilder('cros-standard%i-c2',
|
| (1, 50)))
|
| -sa.AddPool('gce_testing', *_GenerateBuilder('cros-testing%i-c2',
|
| - (1, 10)))
|
|
|
| # Define slave classes.
|
| precq = sa.Alloc('precq', subtype='baremetal', pools=('baremetal',), count=32)
|
| precq_novmtest = sa.Alloc('precq', subtype='gce', pools=('gce',), count=None)
|
| general = sa.Alloc('general', pools=('baremetal',), count=None)
|
| -gce_testing = sa.Alloc('testing', subtype='gce', pools=('gce_testing',),
|
| - count=None)
|
|
|
| for builders, pools in (
|
| (chromiumos_tryserver_util.precq_builders, (precq,)),
|
| (chromiumos_tryserver_util.precq_novmtest_builders, (precq_novmtest,)),
|
| - (chromiumos_tryserver_util.all_builders, (general, gce_testing)),
|
| + (chromiumos_tryserver_util.all_builders, (general,)),
|
| ):
|
| for builder in builders:
|
| for pool in pools:
|
| sa.Join(builder, pool)
|
|
|
| def _GenerateSlave(host, entry):
|
| - testing = gce_testing in entry.classes
|
| return {
|
| 'master': 'ChromiumOSTryServer',
|
| 'builder': list(entry.keys),
|
| 'hostname': host,
|
| 'os': 'linux',
|
| - 'version': 'precise' if not testing else 'testing',
|
| + 'version': 'trusty',
|
| }
|
| slaves = [_GenerateSlave(slave, builders)
|
| for slave, builders in sa.GetSlaveMap().entries.iteritems()]
|
|
|