| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2011 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 | 10 |
| 11 LINUX_CANARY_BUILDSLAVES = range(1, 16) | 11 LINUX_CANARY_BUILDSLAVES = range(1, 16) |
| 12 LINUX_COMPILE_BUILDSLAVES = range(1, 51) | 12 LINUX_COMPILE_BUILDSLAVES = range(1, 51) |
| 13 LINUX_TEST_BUILDSLAVES = range(10) | 13 LINUX_TEST_BUILDSLAVES = range(10) |
| 14 | 14 |
| 15 INTEGER_WIDTH = 3 | 15 INTEGER_WIDTH = 3 |
| 16 DEFAULT_CONCURRENT_BUILDSLAVES = range(4) | 16 DEFAULT_CONCURRENT_BUILDSLAVES = range(4) |
| 17 DEFAULT_COMPILE_BUILDSLAVES = range(10) | 17 DEFAULT_COMPILE_BUILDSLAVES = range(10) |
| 18 WIN7_COMPILE_BUILDSLAVES = (0, 4) | 18 WIN7_COMPILE_BUILDSLAVES = (0, 4) |
| 19 WIN7_GCE_COMPILE_BUILDSLAVES = range(10) |
| 19 WIN8_COMPILE_BUILDSLAVES = range(2) | 20 WIN8_COMPILE_BUILDSLAVES = range(2) |
| 20 ANDROID_KEEPALIVE_CONDITION = ['python', | 21 ANDROID_KEEPALIVE_CONDITION = ['python', |
| 21 'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial', | 22 'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial', |
| 22 '%(serial)s'] | 23 '%(serial)s'] |
| 23 DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux' | 24 DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux' |
| 24 DEFAULT_NACL_SDK_ROOT = '/home/chrome-bot/nacl_sdk/pepper_32' | 25 DEFAULT_NACL_SDK_ROOT = '/home/chrome-bot/nacl_sdk/pepper_32' |
| 25 LINUX_COMPILE_BUILDERS = [ | 26 LINUX_COMPILE_BUILDERS = [ |
| 26 'Build-Ubuntu13.10-GCC4.8-x86-Debug', | 27 'Build-Ubuntu13.10-GCC4.8-x86-Debug', |
| 27 'Build-Ubuntu13.10-GCC4.8-x86-Release', | 28 'Build-Ubuntu13.10-GCC4.8-x86-Release', |
| 28 'Build-Ubuntu13.10-GCC4.8-x86_64-Debug', | 29 'Build-Ubuntu13.10-GCC4.8-x86_64-Debug', |
| (...skipping 15 matching lines...) Expand all Loading... |
| 44 'Build-Ubuntu13.10-GCC4.8-Mips-Debug-Android', | 45 'Build-Ubuntu13.10-GCC4.8-Mips-Debug-Android', |
| 45 'Build-Ubuntu13.10-GCC4.8-Mips-Release-Android', | 46 'Build-Ubuntu13.10-GCC4.8-Mips-Release-Android', |
| 46 'Build-Ubuntu13.10-GCC4.8-x86-Debug-CrOS_Alex', | 47 'Build-Ubuntu13.10-GCC4.8-x86-Debug-CrOS_Alex', |
| 47 'Build-Ubuntu13.10-GCC4.8-x86-Release-CrOS_Alex', | 48 'Build-Ubuntu13.10-GCC4.8-x86-Release-CrOS_Alex', |
| 48 'Build-Ubuntu13.10-GCC4.8-x86_64-Debug-CrOS_Link', | 49 'Build-Ubuntu13.10-GCC4.8-x86_64-Debug-CrOS_Link', |
| 49 'Build-Ubuntu13.10-GCC4.8-x86_64-Release-CrOS_Link', | 50 'Build-Ubuntu13.10-GCC4.8-x86_64-Release-CrOS_Link', |
| 50 'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-CrOS_Daisy', | 51 'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-CrOS_Daisy', |
| 51 'Build-Ubuntu13.10-GCC4.8-Arm7-Release-CrOS_Daisy', | 52 'Build-Ubuntu13.10-GCC4.8-Arm7-Release-CrOS_Daisy', |
| 52 'Build-Ubuntu13.10-Clang-x86_64-Debug', | 53 'Build-Ubuntu13.10-Clang-x86_64-Debug', |
| 53 ] | 54 ] |
| 55 WIN7_COMPILE_BUILDERS = [ |
| 56 'Build-Win7-VS2010-x86-Debug', |
| 57 'Build-Win7-VS2010-x86-Release', |
| 58 'Build-Win7-VS2010-x86_64-Debug', |
| 59 'Build-Win7-VS2010-x86_64-Release', |
| 60 'Build-Win7-VS2010-x86-Debug-ANGLE', |
| 61 'Build-Win7-VS2010-x86-Release-ANGLE', |
| 62 'Build-Win7-VS2010-x86-Debug-DirectWrite', |
| 63 'Build-Win7-VS2010-x86-Release-DirectWrite', |
| 64 'Build-Win7-VS2010-x86-Debug-Exceptions', |
| 65 ] |
| 54 | 66 |
| 55 | 67 |
| 56 def _Format(obj, dictionary): | 68 def _Format(obj, dictionary): |
| 57 """ Recursively apply the dictionary to any format strings in the requested | 69 """ Recursively apply the dictionary to any format strings in the requested |
| 58 object. Returns a copy and does not modify the original. """ | 70 object. Returns a copy and does not modify the original. """ |
| 59 if isinstance(obj, str): | 71 if isinstance(obj, str): |
| 60 return obj % dictionary | 72 return obj % dictionary |
| 61 if isinstance(obj, list): | 73 if isinstance(obj, list): |
| 62 return [_Format(item, dictionary) for item in obj] | 74 return [_Format(item, dictionary) for item in obj] |
| 63 if isinstance(obj, dict): | 75 if isinstance(obj, dict): |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 'builder': [ | 530 'builder': [ |
| 519 'Build-Mac10.8-Clang-x86-Debug', | 531 'Build-Mac10.8-Clang-x86-Debug', |
| 520 'Build-Mac10.8-Clang-x86-Release', | 532 'Build-Mac10.8-Clang-x86-Release', |
| 521 'Build-Mac10.8-Clang-x86_64-Debug', | 533 'Build-Mac10.8-Clang-x86_64-Debug', |
| 522 'Build-Mac10.8-Clang-x86_64-Release', | 534 'Build-Mac10.8-Clang-x86_64-Release', |
| 523 ], | 535 ], |
| 524 } for i in DEFAULT_COMPILE_BUILDSLAVES | 536 } for i in DEFAULT_COMPILE_BUILDSLAVES |
| 525 ] + [ | 537 ] + [ |
| 526 { | 538 { |
| 527 'master': 'CompileSkia', | 539 'master': 'CompileSkia', |
| 540 'hostname': 'skiabot-win-vm-%s' % ('%d' % i).zfill(INTEGER_WIDTH), |
| 541 'builder': WIN7_COMPILE_BUILDERS, |
| 542 } for i in WIN7_GCE_COMPILE_BUILDSLAVES |
| 543 ] + [ |
| 544 { |
| 545 'master': 'CompileSkia', |
| 528 'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH), | 546 'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH), |
| 529 'builder': [ | 547 'builder': WIN7_COMPILE_BUILDERS, |
| 530 'Build-Win7-VS2010-x86-Debug', | |
| 531 'Build-Win7-VS2010-x86-Release', | |
| 532 'Build-Win7-VS2010-x86_64-Debug', | |
| 533 'Build-Win7-VS2010-x86_64-Release', | |
| 534 'Build-Win7-VS2010-x86-Debug-ANGLE', | |
| 535 'Build-Win7-VS2010-x86-Release-ANGLE', | |
| 536 'Build-Win7-VS2010-x86-Debug-DirectWrite', | |
| 537 'Build-Win7-VS2010-x86-Release-DirectWrite', | |
| 538 'Build-Win7-VS2010-x86-Debug-Exceptions', | |
| 539 ], | |
| 540 } for i in WIN7_COMPILE_BUILDSLAVES | 548 } for i in WIN7_COMPILE_BUILDSLAVES |
| 541 ] + [ | 549 ] + [ |
| 542 { | 550 { |
| 543 'master': 'CompileSkia', | 551 'master': 'CompileSkia', |
| 544 'hostname': 'skiabot-win8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH), | 552 'hostname': 'skiabot-win8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH), |
| 545 'builder': [ | 553 'builder': [ |
| 546 'Build-Win8-VS2012-x86-Debug', | 554 'Build-Win8-VS2012-x86-Debug', |
| 547 'Build-Win8-VS2012-x86-Release', | 555 'Build-Win8-VS2012-x86-Release', |
| 548 'Build-Win8-VS2012-x86_64-Debug', | 556 'Build-Win8-VS2012-x86_64-Debug', |
| 549 'Build-Win8-VS2012-x86_64-Release', | 557 'Build-Win8-VS2012-x86_64-Release', |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 | 637 |
| 630 cq_trybots = [ | 638 cq_trybots = [ |
| 631 'Build-Mac10.8-Clang-x86-Release-Trybot', | 639 'Build-Mac10.8-Clang-x86-Release-Trybot', |
| 632 'Build-Mac10.8-Clang-x86_64-Release-Trybot', | 640 'Build-Mac10.8-Clang-x86_64-Release-Trybot', |
| 633 'Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot', | 641 'Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot', |
| 634 'Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot', | 642 'Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot', |
| 635 'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot', | 643 'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot', |
| 636 'Build-Win7-VS2010-x86-Debug-Trybot', | 644 'Build-Win7-VS2010-x86-Debug-Trybot', |
| 637 'Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot', | 645 'Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot', |
| 638 ] | 646 ] |
| OLD | NEW |