master/master_compile_builders_cfg.py - Issue 380733003: slave_hosts_cfg: Use new Windows GCE instances, use fewer, 16-core GCE instances

Unified Diff: master/master_compile_builders_cfg.py

Issue 380733003: slave_hosts_cfg: Use new Windows GCE instances, use fewer, 16-core GCE instances (Closed) Base URL: https://skia.googlesource.com/buildbot.git@master

Patch Set: Remove Win8 compile bots, rename Win7->Win, 2010->2013 Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: master/master_compile_builders_cfg.py

diff --git a/master/master_compile_builders_cfg.py b/master/master_compile_builders_cfg.py

index 59fa1bbfdfc1b0f13e489e2d91fdbdab291dcfa9..f843585e2e49cd50bb0f45d47436e03e6c205ebb 100644

--- a/master/master_compile_builders_cfg.py

+++ b/master/master_compile_builders_cfg.py

@@ -10,7 +10,7 @@

from master_builders_cfg import CLANG, CompileBuilder

from master_builders_cfg import GYP_ANGLE, GYP_DW, GYP_EXC, GYP_IOS

-from master_builders_cfg import GYP_WIN7, GYP_WIN8, LINUX, MAC, NO_GPU

+from master_builders_cfg import GYP_WIN7, LINUX, MAC, NO_GPU

from master_builders_cfg import PDFVIEWER, S_PERCOMMIT, WIN32

from skia_master_scripts.android_factory import AndroidFactory as f_android

@@ -56,19 +56,15 @@ def setup_compile_builders(helper, do_upload_render_results,

('Mac10.8', 'Clang', 'Release', 'x86', None, None, True, f_factory, MAC, S_PERCOMMIT, {}),

('Mac10.8', 'Clang', 'Debug', 'x86_64', None, None, False, f_factory, MAC, S_PERCOMMIT, {}),

('Mac10.8', 'Clang', 'Release', 'x86_64', None, PDFVIEWER, False, f_factory, MAC, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Debug', 'x86', None, GYP_WIN7, True, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Release', 'x86', None, GYP_WIN7, True, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Debug', 'x86_64', None, GYP_WIN7, False, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Release', 'x86_64', None, GYP_WIN7, False, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Debug', 'x86', 'ANGLE', GYP_ANGLE, True, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Release', 'x86', 'ANGLE', GYP_ANGLE, True, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Debug', 'x86', 'DirectWrite', GYP_DW, False, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Release', 'x86', 'DirectWrite', GYP_DW, False, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win7', 'VS2010', 'Debug', 'x86', 'Exceptions', GYP_EXC, False, f_factory, WIN32, S_PERCOMMIT, {}),

- ('Win8', 'VS2012', 'Debug', 'x86', None, GYP_WIN8, True, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most']}),

- ('Win8', 'VS2012', 'Release', 'x86', None, GYP_WIN8, True, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most']}),

- ('Win8', 'VS2012', 'Debug', 'x86_64', None, GYP_WIN8, False, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most']}),

- ('Win8', 'VS2012', 'Release', 'x86_64', None, GYP_WIN8, False, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most']}),

+ ('Win', 'VS2013', 'Debug', 'x86', None, GYP_WIN7, True, f_factory, WIN32, S_PERCOMMIT, {}),

mtklein 2014/07/16 13:33:18 I'd be OK with even just 'VS' here, and that only

+ ('Win', 'VS2013', 'Release', 'x86', None, GYP_WIN7, True, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Debug', 'x86_64', None, GYP_WIN7, False, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Release', 'x86_64', None, GYP_WIN7, False, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Debug', 'x86', 'ANGLE', GYP_ANGLE, True, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Release', 'x86', 'ANGLE', GYP_ANGLE, True, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Debug', 'x86', 'DirectWrite', GYP_DW, False, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Release', 'x86', 'DirectWrite', GYP_DW, False, f_factory, WIN32, S_PERCOMMIT, {}),

+ ('Win', 'VS2013', 'Debug', 'x86', 'Exceptions', GYP_EXC, False, f_factory, WIN32, S_PERCOMMIT, {}),

('Ubuntu13.10', 'GCC4.8', 'Debug', 'Arm7', 'Android', None, True, f_android, LINUX, S_PERCOMMIT, {'device': 'arm_v7_thumb'}),

('Ubuntu13.10', 'GCC4.8', 'Release', 'Arm7', 'Android', None, True, f_android, LINUX, S_PERCOMMIT, {'device': 'arm_v7_thumb'}),

('Ubuntu13.10', 'GCC4.8', 'Debug', 'Arm7', 'Android_NoThumb', None, True, f_android, LINUX, S_PERCOMMIT, {'device': 'arm_v7'}),

« no previous file with comments | « master/master_builders_cfg.py ('k') | master/slaves.cfg » ('j') | no next file with comments »