| Index: master/slaves.cfg
|
| diff --git a/master/slaves.cfg b/master/slaves.cfg
|
| index ab0242df161d003dbdded52d8e76ef6ccdd056b2..9af27fd5a3416d0b509d0e3bbee34fe55cf7160b 100644
|
| --- a/master/slaves.cfg
|
| +++ b/master/slaves.cfg
|
| @@ -16,6 +16,7 @@ INTEGER_WIDTH = 3
|
| DEFAULT_CONCURRENT_BUILDSLAVES = range(4)
|
| DEFAULT_COMPILE_BUILDSLAVES = range(10)
|
| WIN7_COMPILE_BUILDSLAVES = (0, 4)
|
| +WIN7_GCE_COMPILE_BUILDSLAVES = range(10)
|
| WIN8_COMPILE_BUILDSLAVES = range(2)
|
| ANDROID_KEEPALIVE_CONDITION = ['python',
|
| 'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial',
|
| @@ -51,6 +52,17 @@ LINUX_COMPILE_BUILDERS = [
|
| 'Build-Ubuntu13.10-GCC4.8-Arm7-Release-CrOS_Daisy',
|
| 'Build-Ubuntu13.10-Clang-x86_64-Debug',
|
| ]
|
| +WIN7_COMPILE_BUILDERS = [
|
| + 'Build-Win7-VS2010-x86-Debug',
|
| + 'Build-Win7-VS2010-x86-Release',
|
| + 'Build-Win7-VS2010-x86_64-Debug',
|
| + 'Build-Win7-VS2010-x86_64-Release',
|
| + 'Build-Win7-VS2010-x86-Debug-ANGLE',
|
| + 'Build-Win7-VS2010-x86-Release-ANGLE',
|
| + 'Build-Win7-VS2010-x86-Debug-DirectWrite',
|
| + 'Build-Win7-VS2010-x86-Release-DirectWrite',
|
| + 'Build-Win7-VS2010-x86-Debug-Exceptions',
|
| +]
|
|
|
|
|
| def _Format(obj, dictionary):
|
| @@ -525,18 +537,14 @@ slaves = [SelfReferenceFormat(d) for d in [
|
| ] + [
|
| {
|
| 'master': 'CompileSkia',
|
| + 'hostname': 'skiabot-win-vm-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| + 'builder': WIN7_COMPILE_BUILDERS,
|
| + } for i in WIN7_GCE_COMPILE_BUILDSLAVES
|
| +] + [
|
| + {
|
| + 'master': 'CompileSkia',
|
| 'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| - 'builder': [
|
| - 'Build-Win7-VS2010-x86-Debug',
|
| - 'Build-Win7-VS2010-x86-Release',
|
| - 'Build-Win7-VS2010-x86_64-Debug',
|
| - 'Build-Win7-VS2010-x86_64-Release',
|
| - 'Build-Win7-VS2010-x86-Debug-ANGLE',
|
| - 'Build-Win7-VS2010-x86-Release-ANGLE',
|
| - 'Build-Win7-VS2010-x86-Debug-DirectWrite',
|
| - 'Build-Win7-VS2010-x86-Release-DirectWrite',
|
| - 'Build-Win7-VS2010-x86-Debug-Exceptions',
|
| - ],
|
| + 'builder': WIN7_COMPILE_BUILDERS,
|
| } for i in WIN7_COMPILE_BUILDSLAVES
|
| ] + [
|
| {
|
|
|