OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 # See master.experimental/slaves.cfg for documentation. | 7 # See master.experimental/slaves.cfg for documentation. |
8 | 8 |
9 # down slaves don't cause re-allocation, just removal | 9 # down slaves don't cause re-allocation, just removal |
10 down_slaves = [ | 10 down_slaves = [ |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 'master': 'TryServer', | 376 'master': 'TryServer', |
377 'builder': [ | 377 'builder': [ |
378 'win_layout', 'win_layout_rel' | 378 'win_layout', 'win_layout_rel' |
379 ], | 379 ], |
380 'hostname': 'vm%d-m4' % number, | 380 'hostname': 'vm%d-m4' % number, |
381 'os': 'win', | 381 'os': 'win', |
382 'version': 'win7', | 382 'version': 'win7', |
383 'bits': '64', | 383 'bits': '64', |
384 } for number in range(521, 525) | 384 } for number in range(521, 525) |
385 ] | 385 ] |
386 ash_aura_slaves = [ | 386 win7_aura_slaves = [ |
387 { | 387 { |
388 'master': 'TryServer', | 388 'master': 'TryServer', |
389 'builder': [ | 389 'builder': [ |
390 'win_ash', 'win_aura', | 390 'win7_aura', |
391 'win', 'win_rel_naclmore', 'win_rel' | 391 'win', 'win_rel_naclmore', 'win_rel' |
392 ], | 392 ], |
393 'hostname': 'vm%d-m4' % number, | 393 'hostname': 'vm%d-m4' % number, |
394 'os': 'win', | 394 'os': 'win', |
395 'version': 'win7', | 395 'version': 'win7', |
396 'bits': '64', | 396 'bits': '64', |
397 } for number in new_win7 | 397 } for number in new_win7 |
398 ] | 398 ] |
| 399 win8_aura_slaves = [ |
| 400 { |
| 401 'master': 'TryServer', |
| 402 'builder': [ |
| 403 'win8_aura', |
| 404 ], |
| 405 'hostname': 'vm115-m4', |
| 406 'os': 'win', |
| 407 'version': 'win8', |
| 408 'bits': '64', |
| 409 } |
| 410 ] |
399 drmemory_slaves = [ | 411 drmemory_slaves = [ |
400 { | 412 { |
401 'master': 'TryServer', | 413 'master': 'TryServer', |
402 # We can also add 'win' to the list of builders but let's not take risks | 414 # We can also add 'win' to the list of builders but let's not take risks |
403 # as this is the only Win7 tryslave now. | 415 # as this is the only Win7 tryslave now. |
404 'builder': ['win_drmemory'], | 416 'builder': ['win_drmemory'], |
405 'hostname': 'vm%d-m4' % i, | 417 'hostname': 'vm%d-m4' % i, |
406 'os': 'win', | 418 'os': 'win', |
407 'version': 'win7', | 419 'version': 'win7', |
408 'bits': '64', | 420 'bits': '64', |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 'os': 'win', | 483 'os': 'win', |
472 'version': 'win7', | 484 'version': 'win7', |
473 'bits': '64', | 485 'bits': '64', |
474 } for i in range(2, 6) + range(16, 56) | 486 } for i in range(2, 6) + range(16, 56) |
475 ] | 487 ] |
476 | 488 |
477 return ( | 489 return ( |
478 normal_slaves + | 490 normal_slaves + |
479 nacl_sdk_slaves + | 491 nacl_sdk_slaves + |
480 layout_slaves + | 492 layout_slaves + |
481 ash_aura_slaves + | 493 win7_aura_slaves + |
| 494 win8_aura_slaves + |
482 drmemory_slaves + | 495 drmemory_slaves + |
483 chromeframe_slave + | 496 chromeframe_slave + |
484 gpu_slaves + | 497 gpu_slaves + |
485 swarm_slaves + | 498 swarm_slaves + |
486 perf_slaves + | 499 perf_slaves + |
487 swarm_dumb_slaves) | 500 swarm_dumb_slaves) |
488 | 501 |
489 | 502 |
490 slaves = filter(in_service, | 503 slaves = filter(in_service, |
491 linux() + mac() + windows() + cros() + android() + ios()) | 504 linux() + mac() + windows() + cros() + android() + ios()) |
OLD | NEW |