Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: master/master_builders_cfg.py

Issue 14517004: Change Builder Names, MkIII (Closed) Base URL: http://skia.googlecode.com/svn/buildbot/
Patch Set: Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | master/master_private_builders_cfg.py » ('j') | master/skia_master_scripts/factory.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Sets up all the builders we want this buildbot master to run. 5 # Sets up all the builders we want this buildbot master to run.
6 6
7 #pylint: disable=C0301
rmistry 2013/04/29 21:02:58 Looks like this works.. cool..
borenet 2013/04/30 11:43:51 Yep!
8
7 from skia_master_scripts import android_factory 9 from skia_master_scripts import android_factory
8 from skia_master_scripts import chromeos_factory 10 from skia_master_scripts import chromeos_factory
9 from skia_master_scripts import factory as skia_factory 11 from skia_master_scripts import factory as skia_factory
10 from skia_master_scripts import housekeeping_percommit_factory, \ 12 from skia_master_scripts import housekeeping_percommit_factory
11 housekeeping_periodic_factory 13 from skia_master_scripts import housekeeping_periodic_factory
12 from skia_master_scripts import ios_factory 14 from skia_master_scripts import ios_factory
13 from skia_master_scripts import nacl_factory 15 from skia_master_scripts import nacl_factory
14 from skia_master_scripts import utils 16 from skia_master_scripts import utils
15 17
16 # Directory where we want to record performance data 18 # Directory where we want to record performance data
17 # 19 #
18 # TODO(epoger): consider changing to reuse existing config.Master.perf_base_url, 20 # TODO(epoger): consider changing to reuse existing config.Master.perf_base_url,
19 # config.Master.perf_report_url_suffix, etc. 21 # config.Master.perf_report_url_suffix, etc.
20 perf_output_basedir_linux = '../../../../perfdata' 22 perf_output_basedir_linux = '../../../../perfdata'
21 perf_output_basedir_mac = perf_output_basedir_linux 23 perf_output_basedir_mac = perf_output_basedir_linux
22 perf_output_basedir_windows = '..\\..\\..\\..\\perfdata' 24 perf_output_basedir_windows = '..\\..\\..\\..\\perfdata'
23 25
24 defaults = {} 26 defaults = {}
25 27
26 28
27 def Update(config, active_master, c): 29 ARCH_TO_GYP_DEFINE = {
30 'x86': 'skia_arch_width=32',
31 'x86_64': 'skia_arch_width=64',
32 'Arm7': 'skia_arch_width=32',
33 'NaCl': None,
34 }
35
36
37 def GetExtraFactoryArgs(compile_builder_info):
38 factory_type = compile_builder_info[8]
39 if factory_type == android_factory.AndroidFactory:
40 # AndroidFactory requires a "device" argument.
41 return {'device': utils.AndroidModelToDevice(compile_builder_info[4])}
42 elif factory_type == skia_factory.SkiaFactory:
43 # Some "normal" factories require extra arguments.
44 if compile_builder_info[4] == 'ANGLE':
45 return {'gm_args': ['--config', 'angle'],
46 'bench_args': ['--config', 'ANGLE'],
47 'bench_pictures_cfg': 'angle'}
48 else:
49 return {}
50 else:
51 return {}
52
53
54 def Update(config, active_master, cfg):
28 helper = utils.SkiaHelper(defaults) 55 helper = utils.SkiaHelper(defaults)
29 56
30 # 57 #
31 # Default (per-commit) Scheduler for Skia. Only use this for builders which 58 # Default (per-commit) Scheduler for Skia. Only use this for builders which
32 # do not care about commits outside of SKIA_PRIMARY_SUBDIRS. 59 # do not care about commits outside of SKIA_PRIMARY_SUBDIRS.
33 # 60 #
34 helper.AnyBranchScheduler('skia_rel', branches=utils.SKIA_PRIMARY_SUBDIRS) 61 helper.AnyBranchScheduler('skia_rel', branches=utils.SKIA_PRIMARY_SUBDIRS)
35 62
36 # 63 #
37 # Periodic Scheduler for Skia. The buildbot master follows UTC. 64 # Periodic Scheduler for Skia. The buildbot master follows UTC.
38 # Setting it to 7AM UTC (2 AM EST). 65 # Setting it to 7AM UTC (2 AM EST).
39 # 66 #
40 helper.PeriodicScheduler('skia_periodic', branch='trunk', minute=0, hour=7) 67 helper.PeriodicScheduler('skia_periodic', branch='trunk', minute=0, hour=7)
41 68
42 # Schedulers for Skia trybots. 69 # Schedulers for Skia trybots.
43 helper.TryJobSubversion(utils.TRY_SCHEDULER_SVN) 70 helper.TryJobSubversion(utils.TRY_SCHEDULER_SVN)
44 helper.TryJobRietveld(utils.TRY_SCHEDULER_RIETVELD) 71 helper.TryJobRietveld(utils.TRY_SCHEDULER_RIETVELD)
45 72
46 # 73 #
47 # Set up all the builders. 74 # Set up all the builders.
48 # 75 #
49 # Don't put spaces or 'funny characters' within the builder names, so that 76 # Don't put spaces or 'funny characters' within the builder names, so that
50 # we can safely use the builder name as part of a filepath. 77 # we can safely use the builder name as part of a filepath.
51 # 78 #
52 do_upload_results = active_master.is_production_host 79 do_upload_results = active_master.is_production_host
53 80
54 # Linux (Ubuntu12) on Shuttle with ATI5770 graphics card 81 gyp_win = 'skia_win_debuggers_path=c:/DbgHelp'
55 defaults['category'] = 'Linux' 82 gyp_angle = gyp_win + ' skia_angle=1'
56 utils.MakeBuilderSet( 83 gyp_dw = gyp_win + ' skia_directwrite=1'
57 helper=helper, 84 gyp_10_6 = 'skia_osx_sdkroot=macosx10.6'
58 factory_type=skia_factory.SkiaFactory, 85 gyp_10_7 = 'skia_mesa=1'
59 builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_64', 86 gyp_ios = 'skia_os=ios'
60 do_upload_results=do_upload_results, 87
61 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 88 # builder_specs is a dictionary whose keys are specifications for compile
62 environment_variables= 89 # builders and values are specifications for Test and Perf builders which will
63 {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=64'}, 90 # eventually *depend* on those compile builders.
64 gm_image_subdir='base-shuttle_ubuntu12_ati5770', 91 builder_specs = {}
65 perf_output_basedir=perf_output_basedir_linux) 92 #
66 utils.MakeBuilderSet( 93 # COMPILE BUILDERS TEST AND PERF BUILDERS
67 helper=helper, 94 #
68 factory_type=skia_factory.SkiaFactory, 95 # OS Compiler Config Arch Extra Config GYP_DEFS W ERR Role OS Model GPU Extra Config GM Subdir
69 builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_32', 96 #
70 do_upload_results=do_upload_results, 97 c = 'Linux'
71 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 98 f = skia_factory.SkiaFactory
72 environment_variables= 99 p = skia_factory.TARGET_PLATFORM_LINUX
73 {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=32'}, 100 builder_specs.update({
74 gm_image_subdir='base-shuttle_ubuntu12_ati5770', 101 ('Ubuntu12', 'GCC', 'Debug', 'x86', None, None, T rue, c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770')],
75 perf_output_basedir=perf_output_basedir_linux) 102 ('Ubuntu12', 'GCC', 'Release', 'x86', None, None, T rue, c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770'),
76 103 ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, None)],
77 # Android (runs on a Linux buildbot slave)... 104 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', None, None, T rue, c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770')],
78 defaults['category'] = 'Android' 105 ('Ubuntu12', 'GCC', 'Release', 'x86_64', None, None, T rue, c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770'),
79 utils.MakeBuilderSet( 106 ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, None)],})
80 helper=helper, 107 c = 'Linux-Special'
81 factory_type=android_factory.AndroidFactory, 108 builder_specs.update({
82 builder_base_name='Skia_NexusS_4-1_Float_%s_32', 109 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'NoGPU', 'skia_gpu=0', T rue, c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'NoGPU', None, 'base-shuttle_ubuntu12_ati5770')],
83 device='nexus_s', 110 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'NoGPU', 'skia_gpu=0', T rue, c, f, p) : [],})
84 extra_branches=['android'], 111 f = nacl_factory.NaClFactory
85 do_upload_results=do_upload_results, 112 builder_specs.update({
86 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 113 ('Ubuntu12', 'GCC', 'Debug', 'NaCl', None, None, T rue, c, f, p) : [],
87 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 114 ('Ubuntu12', 'GCC', 'Release', 'NaCl', None, None, T rue, c, f, p) : [],})
88 gm_image_subdir='base-android-nexus-s', 115 c = 'Mac-10.6'
89 perf_output_basedir=perf_output_basedir_linux) 116 f = skia_factory.SkiaFactory
90 utils.MakeBuilderSet( 117 p = skia_factory.TARGET_PLATFORM_MAC
91 helper=helper, 118 builder_specs.update({
92 factory_type=android_factory.AndroidFactory, 119 ('Mac10.6', 'GCC', 'Debug', 'x86', None, gyp_10_6, T rue, c, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini')],
93 builder_base_name='Skia_Xoom_4-1_Float_%s_32', 120 ('Mac10.6', 'GCC', 'Release', 'x86', None, gyp_10_6, T rue, c, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini'),
94 device='xoom', 121 ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, None)],
95 extra_branches=['android'], 122 ('Mac10.6', 'GCC', 'Debug', 'x86_64', None, gyp_10_6, F alse, c, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini')],
96 do_upload_results=do_upload_results, 123 ('Mac10.6', 'GCC', 'Release', 'x86_64', None, gyp_10_6, F alse, c, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini'),
97 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 124 ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, None)],})
98 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 125 c = 'Mac-10.7'
99 gm_image_subdir='base-android-xoom', 126 builder_specs.update({
100 perf_output_basedir=perf_output_basedir_linux) 127 ('Mac10.7', 'Clang', 'Debug', 'x86', None, gyp_10_7, T rue, c, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float')],
101 utils.MakeBuilderSet( 128 ('Mac10.7', 'Clang', 'Release', 'x86', None, gyp_10_7, T rue, c, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float'),
102 helper=helper, 129 ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, None)],
103 factory_type=android_factory.AndroidFactory, 130 ('Mac10.7', 'Clang', 'Debug', 'x86_64', None, gyp_10_7, F alse, c, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float')],
104 builder_base_name='Skia_GalaxyNexus_4-1_Float_%s_32', 131 ('Mac10.7', 'Clang', 'Release', 'x86_64', None, gyp_10_7, F alse, c, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float'),
105 device='galaxy_nexus', 132 ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, None)],})
106 extra_branches=['android'], 133 c = 'Mac-10.8'
107 do_upload_results=do_upload_results, 134 builder_specs.update({
108 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 135 ('Mac10.8', 'Clang', 'Debug', 'x86', None, None, T rue, c, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8')],
109 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 136 ('Mac10.8', 'Clang', 'Release', 'x86', None, None, T rue, c, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8'),
110 gm_image_subdir='base-android-galaxy-nexus', 137 ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, None)],
111 perf_output_basedir=perf_output_basedir_linux) 138 ('Mac10.8', 'Clang', 'Debug', 'x86_64', None, None, F alse, c, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8')],
112 utils.MakeBuilderSet( 139 ('Mac10.8', 'Clang', 'Release', 'x86_64', None, None, F alse, c, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8'),
113 helper=helper, 140 ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, None)],})
114 factory_type=android_factory.AndroidFactory, 141 c = 'Win7'
115 builder_base_name='Skia_Nexus4_4-1_Float_%s_32', 142 p = skia_factory.TARGET_PLATFORM_WIN32
116 device='nexus_4', 143 builder_specs.update({
117 extra_branches=['android'], 144 ('Win7', 'VS2010', 'Debug', 'x86', None, gyp_win, T rue, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float')],
118 do_upload_results=do_upload_results, 145 ('Win7', 'VS2010', 'Release', 'x86', None, gyp_win, T rue, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float'),
119 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 146 ('Perf', 'Win7', 'ShuttleA', 'HD2000', None, None)],
120 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 147 ('Win7', 'VS2010', 'Debug', 'x86_64', None, gyp_win, F alse, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float')],
121 gm_image_subdir='base-android-nexus-4', 148 ('Win7', 'VS2010', 'Release', 'x86_64', None, gyp_win, F alse, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float'),
122 perf_output_basedir=perf_output_basedir_linux) 149 ('Perf', 'Win7', 'ShuttleA', 'HD2000', None, None)],})
123 utils.MakeBuilderSet( 150 c = 'Win7-Special'
124 helper=helper, 151 builder_specs.update({
125 factory_type=android_factory.AndroidFactory, 152 ('Win7', 'VS2010', 'Debug', 'x86', 'ANGLE', gyp_angle, T rue, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', 'base-shuttle-win7-intel-angle')],
126 builder_base_name='Skia_Nexus7_4-1_Float_%s_32', 153 ('Win7', 'VS2010', 'Release', 'x86', 'ANGLE', gyp_angle, T rue, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', 'base-shuttle-win7-intel-angle'),
127 device='nexus_7', 154 ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', None)],
128 extra_branches=['android'], 155 ('Win7', 'VS2010', 'Debug', 'x86', 'DirectWrite', gyp_dw, F alse, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite ', 'base-shuttle-win7-intel-directwrite')],
129 do_upload_results=do_upload_results, 156 ('Win7', 'VS2010', 'Release', 'x86', 'DirectWrite', gyp_dw, F alse, c, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite ', 'base-shuttle-win7-intel-directwrite'),
130 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 157 ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite ', None)],})
131 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 158 c = 'Android'
132 gm_image_subdir='base-android-nexus-7', 159 f = android_factory.AndroidFactory
133 perf_output_basedir=perf_output_basedir_linux) 160 p = skia_factory.TARGET_PLATFORM_LINUX
134 utils.MakeBuilderSet( 161 builder_specs.update({
135 helper=helper, 162 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'NexusS', None, T rue, c, f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None, 'base-android-nexus-s')],
136 factory_type=android_factory.AndroidFactory, 163 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'NexusS', None, T rue, c, f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None, 'base-android-nexus-s'),
137 builder_base_name='Skia_Nexus10_4-1_Float_%s_32', 164 ('Perf', 'Android', 'NexusS', 'SGX540', None, None)],
138 device='nexus_10', 165 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus4', None, T rue, c, f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None, 'base-android-nexus-4')],
139 extra_branches=['android'], 166 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus4', None, T rue, c, f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None, 'base-android-nexus-4'),
140 do_upload_results=do_upload_results, 167 ('Perf', 'Android', 'Nexus4', 'Adreno320', None, None)],
141 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 168 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus7', None, T rue, c, f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None, 'base-android-nexus-7')],
142 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 169 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus7', None, T rue, c, f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None, 'base-android-nexus-7'),
143 gm_image_subdir='base-android-nexus-10', 170 ('Perf', 'Android', 'Nexus7', 'Tegra3', None, None)],
144 perf_output_basedir=perf_output_basedir_linux) 171 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus10', None, T rue, c, f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None, 'base-android-nexus-10')],
145 utils.MakeBuilderSet( 172 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus10', None, T rue, c, f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None, 'base-android-nexus-10'),
146 helper=helper, 173 ('Perf', 'Android', 'Nexus10', 'MaliT604', None, None)],
147 factory_type=android_factory.AndroidFactory, 174 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'GalaxyNexus', None, T rue, c, f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None, 'base-android-galaxy-nexus')],
148 builder_base_name='Skia_RazrI_4-1_Float_%s_32', 175 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'GalaxyNexus', None, T rue, c, f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None, 'base-android-galaxy-nexus'),
149 device='x86', 176 ('Perf', 'Android', 'GalaxyNexus','SGX540', None, None)],
150 extra_branches=['android'], 177 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Xoom', None, T rue, c, f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None, 'base-android-xoom')],
151 do_upload_results=do_upload_results, 178 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Xoom', None, T rue, c, f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None, 'base-android-xoom'),
152 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 179 ('Perf', 'Android', 'Xoom', 'Tegra2', None, None)],
153 environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'}, 180 ('Ubuntu12', 'GCC', 'Debug', 'x86', 'RazrI', None, T rue, c, f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None, 'base-android-razr-i')],
154 gm_image_subdir='base-android-razr-i', 181 ('Ubuntu12', 'GCC', 'Release', 'x86', 'RazrI', None, T rue, c, f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None, 'base-android-razr-i'),
155 perf_output_basedir=perf_output_basedir_linux) 182 ('Perf', 'Android', 'RazrI', 'SGX540', None, None)],})
156 183 c = 'ChromeOS'
157 # Mac 10.6 (SnowLeopard) ... 184 f = chromeos_factory.ChromeOSFactory
158 defaults['category'] = 'Mac-10.6' 185 builder_specs.update({
159 utils.MakeBuilderSet( 186 ('Ubuntu12', 'GCC', 'Debug', 'x86', 'ChromeOS', 'skia_gpu=0', Tr ue, c, f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None, None)],
160 helper=helper, 187 ('Ubuntu12', 'GCC', 'Release', 'x86', 'ChromeOS', 'skia_gpu=0', Tr ue, c, f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None, None),
161 factory_type=skia_factory.SkiaFactory, 188 ('Perf', 'ChromeOS', 'Alex', 'GMA3150', None, None)],})
162 builder_base_name='Skia_Mac_Float_%s_32', 189 c = 'iOS'
163 do_upload_results=do_upload_results, 190 f = ios_factory.iOSFactory
164 target_platform=skia_factory.TARGET_PLATFORM_MAC, 191 p = skia_factory.TARGET_PLATFORM_MAC
165 environment_variables= 192 builder_specs.update({
166 {'GYP_DEFINES': ('skia_osx_sdkroot=macosx10.6 skia_scalar=float ' 193 ('Mac10.7', 'Clang', 'Debug', 'Arm7', 'iOS', gyp_ios, T rue, c, f, p) : [],
167 'skia_arch_width=32')}, 194 ('Mac10.7', 'Clang', 'Release', 'Arm7', 'iOS', gyp_ios, T rue, c, f, p) : [],})
168 gm_image_subdir='base-macmini', 195
169 perf_output_basedir=perf_output_basedir_mac) 196 for compile_builder in builder_specs.keys():
170 utils.MakeBuilderSet( 197 factory_type = compile_builder[8]
171 helper=helper, 198 factory_args = GetExtraFactoryArgs(compile_builder)
172 factory_type=skia_factory.SkiaFactory, 199 target_platform = compile_builder[9]
173 builder_base_name='Skia_Mac_Float_%s_64', 200 try:
174 do_upload_results=do_upload_results, 201 arch_width_define = ARCH_TO_GYP_DEFINE[compile_builder[3]]
175 target_platform=skia_factory.TARGET_PLATFORM_MAC, 202 except KeyError:
176 environment_variables= 203 raise Exception('Unknown arch type: %s' % compile_builder[3])
177 {'GYP_DEFINES': ('skia_osx_sdkroot=macosx10.6 skia_scalar=float ' 204 gyp_defines = compile_builder[5]
178 'skia_arch_width=64')}, 205 if arch_width_define:
179 gm_image_subdir='base-macmini', 206 if not gyp_defines:
180 perf_output_basedir=perf_output_basedir_mac, 207 gyp_defines = arch_width_define
181 compile_bot_warnings_as_errors=False) 208 else:
182 209 if 'skia_arch_width' in gyp_defines:
183 # Mac 10.7 (Lion) ... 210 raise ValueError('Cannot define skia_arch_width; it is derived from '
184 defaults['category'] = 'Mac-10.7' 211 'the provided arch type.')
185 utils.MakeBuilderSet( 212 gyp_defines += ' ' + arch_width_define
186 helper=helper, 213 defaults['category'] = utils.CATEGORY_BUILD
187 factory_type=skia_factory.SkiaFactory, 214 utils.MakeCompileBuilderSet(
188 builder_base_name='Skia_MacMiniLion_Float_%s_32', 215 helper=helper,
189 do_upload_results=do_upload_results, 216 scheduler='skia_rel',
190 target_platform=skia_factory.TARGET_PLATFORM_MAC, 217 os=compile_builder[0],
rmistry 2013/04/29 21:02:58 Looks like you decided not to have helper methods
borenet 2013/04/30 11:43:51 It looked like it was going to get much messier an
191 environment_variables= 218 compiler=compile_builder[1],
192 {'GYP_DEFINES': 'skia_scalar=float skia_mesa=1 skia_arch_width=32'}, 219 configuration=compile_builder[2],
193 gm_image_subdir='base-macmini-lion-float', 220 target_arch=compile_builder[3],
194 perf_output_basedir=perf_output_basedir_mac) 221 extra_config=compile_builder[4],
195 utils.MakeBuilderSet( 222 environment_variables={'GYP_DEFINES': gyp_defines},
196 helper=helper, 223 do_upload_results=do_upload_results,
197 factory_type=skia_factory.SkiaFactory, 224 compile_warnings_as_errors=compile_builder[6],
198 builder_base_name='Skia_MacMiniLion_Float_%s_64', 225 factory_type=factory_type,
199 do_upload_results=do_upload_results, 226 target_platform=target_platform,
200 target_platform=skia_factory.TARGET_PLATFORM_MAC, 227 **factory_args)
201 environment_variables= 228 defaults['category'] = compile_builder[7]
202 {'GYP_DEFINES': 'skia_scalar=float skia_mesa=1 skia_arch_width=64'}, 229 for dependent_builder in builder_specs[compile_builder]:
203 gm_image_subdir='base-macmini-lion-float', 230 role = dependent_builder[0]
204 perf_output_basedir=perf_output_basedir_mac, 231 perf_output_basedir = None
205 compile_bot_warnings_as_errors=False) 232 if role == utils.BUILDER_ROLE_PERF:
206 233 if target_platform == skia_factory.TARGET_PLATFORM_LINUX:
207 # Mac 10.8 (Mountain Lion) ... 234 perf_output_basedir = perf_output_basedir_linux
208 defaults['category'] = 'Mac-10.8' 235 elif target_platform == skia_factory.TARGET_PLATFORM_MAC:
209 utils.MakeBuilderSet( 236 perf_output_basedir = perf_output_basedir_mac
210 helper=helper, 237 elif target_platform == skia_factory.TARGET_PLATFORM_WIN32:
211 factory_type=skia_factory.SkiaFactory, 238 perf_output_basedir = perf_output_basedir_windows
212 builder_base_name='Skia_MacMini_10_8_Float_%s_32', 239 utils.MakeBuilderSet(
213 do_upload_results=do_upload_results, 240 helper=helper,
214 target_platform=skia_factory.TARGET_PLATFORM_MAC, 241 role=role,
215 environment_variables= 242 os=dependent_builder[1],
216 {'GYP_DEFINES': 'skia_scalar=float skia_arch_width=32'}, 243 model=dependent_builder[2],
217 gm_image_subdir='base-macmini-10_8', 244 gpu=dependent_builder[3],
218 perf_output_basedir=perf_output_basedir_mac) 245 extra_config=dependent_builder[4],
219 utils.MakeBuilderSet( 246 configuration=compile_builder[2],
220 helper=helper, 247 arch=compile_builder[3],
221 factory_type=skia_factory.SkiaFactory, 248 environment_variables={'GYP_DEFINES': gyp_defines},
222 builder_base_name='Skia_MacMini_10_8_Float_%s_64', 249 factory_type=factory_type,
223 do_upload_results=do_upload_results, 250 target_platform=target_platform,
224 target_platform=skia_factory.TARGET_PLATFORM_MAC, 251 gm_image_subdir=dependent_builder[5],
225 environment_variables= 252 do_upload_results=do_upload_results,
226 {'GYP_DEFINES': 'skia_scalar=float skia_arch_width=64'}, 253 perf_output_basedir=perf_output_basedir,
227 gm_image_subdir='base-macmini-10_8', 254 compile_warnings_as_errors=False,
228 perf_output_basedir=perf_output_basedir_mac, 255 **factory_args)
229 compile_bot_warnings_as_errors=False)
230
231 # Windows7 running on Shuttle PC with Intel Core i7-2600 with on-CPU graphics
232 defaults['category'] = 'Win7'
233 utils.MakeBuilderSet(
234 helper=helper,
235 factory_type=skia_factory.SkiaFactory,
236 builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_32',
237 do_upload_results=do_upload_results,
238 target_platform=skia_factory.TARGET_PLATFORM_WIN32,
239 environment_variables=
240 {'GYP_DEFINES': ('skia_scalar=float skia_arch_width=32 '
241 'skia_win_debuggers_path=c:/DbgHelp')},
242 gm_image_subdir='base-shuttle-win7-intel-float',
243 perf_output_basedir=perf_output_basedir_windows)
244 utils.MakeBuilderSet(
245 helper=helper,
246 factory_type=skia_factory.SkiaFactory,
247 builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_64',
248 do_upload_results=do_upload_results,
249 target_platform=skia_factory.TARGET_PLATFORM_WIN32,
250 environment_variables=
251 {'GYP_DEFINES': ('skia_scalar=float skia_arch_width=64 '
252 'skia_win_debuggers_path=c:/DbgHelp')},
253 gm_image_subdir='base-shuttle-win7-intel-float',
254 perf_output_basedir=perf_output_basedir_windows,
255 compile_bot_warnings_as_errors=False)
256
257 # Special-purpose Win7 builders
258 defaults['category'] = 'Win7-Special'
259 utils.MakeBuilderSet(
260 helper=helper,
261 factory_type=skia_factory.SkiaFactory,
262 builder_base_name='Skia_Shuttle_Win7_Intel_Float_ANGLE_%s_32',
263 do_upload_results=do_upload_results,
264 target_platform=skia_factory.TARGET_PLATFORM_WIN32,
265 environment_variables=
266 {'GYP_DEFINES': ('skia_scalar=float skia_angle=1 skia_arch_width=32 '
267 'skia_win_debuggers_path=c:/DbgHelp')},
268 gm_image_subdir='base-shuttle-win7-intel-angle',
269 perf_output_basedir=perf_output_basedir_windows,
270 gm_args=['--config', 'angle'],
271 bench_args=['--config', 'ANGLE'],
272 bench_pictures_cfg='angle')
273 utils.MakeBuilderSet(
274 helper=helper,
275 factory_type=skia_factory.SkiaFactory,
276 builder_base_name='Skia_Shuttle_Win7_Intel_Float_DirectWrite_%s_32',
277 do_upload_results=do_upload_results,
278 target_platform=skia_factory.TARGET_PLATFORM_WIN32,
279 environment_variables=
280 {'GYP_DEFINES':
281 ('skia_scalar=float skia_directwrite=1 skia_arch_width=32 '
282 'skia_win_debuggers_path=c:/DbgHelp')},
283 gm_image_subdir='base-shuttle-win7-intel-directwrite',
284 perf_output_basedir=perf_output_basedir_windows)
285
286 defaults['category'] = 'iOS'
287 utils.MakeBuilderSet(
288 helper=helper,
289 factory_type=ios_factory.iOSFactory,
290 builder_base_name='Skia_iOS_%s_32',
291 do_upload_results=do_upload_results,
292 target_platform=skia_factory.TARGET_PLATFORM_MAC,
293 environment_variables={'GYP_DEFINES': 'skia_os=ios'},
294 gm_image_subdir=None,
295 perf_output_basedir=None,
296 do_debug=False,
297 do_release=False,
298 do_bench=False)
299 256
300 # House Keeping 257 # House Keeping
301 defaults['category'] = ' Housekeeping' 258 defaults['category'] = ' Housekeeping'
302 utils.MakeHousekeeperBuilderSet( 259 builder_factory_scheduler = [
303 helper=helper, 260 # The Percommit housekeeper
304 percommit_factory_type=\ 261 (utils.MakeBuilderName(role='Housekeeper', frequency='PerCommit'),
305 housekeeping_percommit_factory.HouseKeepingPerCommitFactory, 262 housekeeping_percommit_factory.HouseKeepingPerCommitFactory,
306 periodic_factory_type=\ 263 'skia_rel'),
307 housekeeping_periodic_factory.HouseKeepingPeriodicFactory, 264 # The Periodic housekeeper
308 do_trybots=True, 265 (utils.MakeBuilderName(role='Housekeeper', frequency='Nightly'),
309 do_upload_results=do_upload_results, 266 housekeeping_periodic_factory.HouseKeepingPeriodicFactory,
310 target_platform=skia_factory.TARGET_PLATFORM_LINUX) 267 'skia_periodic'),
311 268 ]
312 # "Special" bots, running on Linux 269 # Add the corresponding trybot builders to the above list.
313 defaults['category'] = 'Linux-Special' 270 builder_factory_scheduler.extend([
314 utils.MakeBuilderSet( 271 (builder + utils.BUILDER_NAME_SEP + utils.TRYBOT_NAME_SUFFIX, factory,
315 helper=helper, 272 utils.TRY_SCHEDULERS_STR)
316 factory_type=skia_factory.SkiaFactory, 273 for (builder, factory, _scheduler) in builder_factory_scheduler])
317 builder_base_name='Skia_Linux_NoGPU_%s_32', 274
318 do_upload_results=do_upload_results, 275 for (builder_name, factory, scheduler) in builder_factory_scheduler:
319 target_platform=skia_factory.TARGET_PLATFORM_LINUX, 276 helper.Builder(builder_name, 'f_%s' % builder_name, scheduler=scheduler)
320 environment_variables= 277 helper.Factory('f_%s' % builder_name,
321 {'GYP_DEFINES': 'skia_scalar=float skia_gpu=0 skia_arch_width=64'}, 278 factory(
322 gm_image_subdir='base-shuttle_ubuntu12_ati5770', 279 do_upload_results=do_upload_results,
323 perf_output_basedir=None, # no perf measurement for debug builds 280 target_platform=skia_factory.TARGET_PLATFORM_LINUX,
324 bench_pictures_cfg='no_gpu', 281 builder_name=builder_name,
325 do_release=False, 282 do_patch_step=(scheduler == utils.TRY_SCHEDULERS_STR),
326 do_bench=False) 283 ).Build())
327 284
328 utils.MakeBuilderSet( 285 return helper.Update(cfg)
329 helper=helper,
330 factory_type=nacl_factory.NaClFactory,
331 builder_base_name='Skia_Shuttle_Ubuntu12_NaCl_%s',
332 do_upload_results=do_upload_results,
333 target_platform=skia_factory.TARGET_PLATFORM_LINUX,
334 gm_image_subdir=None,
335 perf_output_basedir=None,
336 do_debug=False,
337 do_release=False,
338 do_bench=False)
339
340 # Chrome OS
341 defaults['category'] = 'ChromeOS'
342 utils.MakeBuilderSet(
343 helper=helper,
344 factory_type=chromeos_factory.ChromeOSFactory,
345 builder_base_name='Skia_ChromeOS_Alex_%s_32',
346 do_upload_results=do_upload_results,
347 target_platform=skia_factory.TARGET_PLATFORM_LINUX,
348 environment_variables=
349 {'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
350 gm_image_subdir=None,
351 perf_output_basedir=perf_output_basedir_linux,
352 bench_pictures_cfg='no_gpu')
353
354 return helper.Update(c)
OLDNEW
« no previous file with comments | « no previous file | master/master_private_builders_cfg.py » ('j') | master/skia_master_scripts/factory.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698