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

Side by Side Diff: masters/master.chromium.mac/master_mac_cfg.py

Issue 10644010: Remove all mac 10.5 bots from the main waterfall. Create placeholders for 10.7 bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 8 years, 6 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
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 from master import master_config 5 from master import master_config
6 from master.factory import chromium_factory 6 from master.factory import chromium_factory
7 7
8 defaults = {} 8 defaults = {}
9 9
10 helper = master_config.Helper(defaults) 10 helper = master_config.Helper(defaults)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 slave_type='Builder', 57 slave_type='Builder',
58 options=[ 58 options=[
59 '--compiler=goma-clang', '--', '-target', 'chromium_builder_tests'], 59 '--compiler=goma-clang', '--', '-target', 'chromium_builder_tests'],
60 factory_properties={ 60 factory_properties={
61 'trigger': 'mac_rel_trigger', 61 'trigger': 'mac_rel_trigger',
62 })) 62 }))
63 63
64 # 64 #
65 # Mac Rel testers 65 # Mac Rel testers
66 # 66 #
67 # B('Mac10.5 Tests (1)', 'rel_unit_1', 'testers', 'mac_rel_trigger', 67 # B('Mac10.6 Tests (1)', 'rel_unit_1', 'testers', 'mac_rel_trigger',
68 # auto_reboot=True, notify_on_missing=True) 68 # auto_reboot=True, notify_on_missing=True)
69 F('rel_unit_1', mac_tester().ChromiumFactory( 69 F('rel_unit_1', mac_tester().ChromiumFactory(
70 slave_type='Tester', 70 slave_type='Tester',
71 build_url=rel_archive, 71 build_url=rel_archive,
72 tests=[ 72 tests=[
73 'base', 73 'base',
74 'browser_tests', 74 'browser_tests',
75 'cacheinvalidation', 75 'cacheinvalidation',
76 'crypto', 76 'crypto',
77 'googleurl', 77 'googleurl',
78 'gpu', 78 'gpu',
79 'jingle', 79 'jingle',
80 'media', 80 'media',
81 'nacl_integration', 81 'nacl_integration',
82 'printing', 82 'printing',
83 'remoting', 83 'remoting',
84 'safe_browsing', 84 'safe_browsing',
85 ], 85 ],
86 factory_properties={'generate_gtest_json': True, 86 factory_properties={'generate_gtest_json': True,
87 'sharded_tests': sharded_tests, 87 'sharded_tests': sharded_tests,
88 'browser_total_shards': 3, 'browser_shard_index': 1,}) 88 'browser_total_shards': 3, 'browser_shard_index': 1,})
89 ) 89 )
90 90
91 # B('Mac10.5 Tests (2)', 'rel_unit_2', 'testers', 'mac_rel_trigger', 91 # B('Mac10.6 Tests (2)', 'rel_unit_2', 'testers', 'mac_rel_trigger',
92 # auto_reboot=True, notify_on_missing=True) 92 # auto_reboot=True, notify_on_missing=True)
93 F('rel_unit_2', mac_tester().ChromiumFactory( 93 F('rel_unit_2', mac_tester().ChromiumFactory(
94 slave_type='Tester', 94 slave_type='Tester',
95 build_url=rel_archive, 95 build_url=rel_archive,
96 tests=[ 96 tests=[
97 'browser_tests', 97 'browser_tests',
98 'unit', 98 'unit',
99 ], 99 ],
100 factory_properties={'generate_gtest_json': True, 100 factory_properties={'generate_gtest_json': True,
101 'sharded_tests': sharded_tests, 101 'sharded_tests': sharded_tests,
102 'browser_total_shards': 3, 'browser_shard_index': 2,}) 102 'browser_total_shards': 3, 'browser_shard_index': 2,})
103 ) 103 )
104 104
105 # B('Mac10.5 Tests (3)', 'rel_unit_3', 'testers', 'mac_rel_trigger', 105 # B('Mac10.6 Tests (3)', 'rel_unit_3', 'testers', 'mac_rel_trigger',
106 # auto_reboot=True, notify_on_missing=True) 106 # auto_reboot=True, notify_on_missing=True)
107 F('rel_unit_3', mac_tester().ChromiumFactory( 107 F('rel_unit_3', mac_tester().ChromiumFactory(
108 slave_type='Tester', 108 slave_type='Tester',
109 build_url=rel_archive, 109 build_url=rel_archive,
110 tests=[ 110 tests=[
111 'browser_tests', 111 'browser_tests',
112 'net', 112 'net',
113 ], 113 ],
114 factory_properties={'generate_gtest_json': True, 114 factory_properties={'generate_gtest_json': True,
115 'sharded_tests': sharded_tests, 115 'sharded_tests': sharded_tests,
116 'browser_total_shards': 3, 'browser_shard_index': 3,}) 116 'browser_total_shards': 3, 'browser_shard_index': 3,})
117 ) 117 )
118 118
119 # B('Mac10.6 Tests (1)', 'rel_unit_1', 'testers', 'mac_rel_trigger', 119 ## B('Mac10.7 Tests (1)', 'rel_unit_1', 'testers', 'mac_rel_trigger',
120 # auto_reboot=True, notify_on_missing=True) 120 ## auto_reboot=True, notify_on_missing=True)
121 # B('Mac10.6 Tests (2)', 'rel_unit_2', 'testers', 'mac_rel_trigger', 121 ## B('Mac10.7 Tests (2)', 'rel_unit_2', 'testers', 'mac_rel_trigger',
122 # auto_reboot=True, notify_on_missing=True) 122 ## auto_reboot=True, notify_on_missing=True)
123 # B('Mac10.6 Tests (3)', 'rel_unit_3', 'testers', 'mac_rel_trigger', 123 ## B('Mac10.7 Tests (3)', 'rel_unit_3', 'testers', 'mac_rel_trigger',
124 # auto_reboot=True, notify_on_missing=True) 124 ## auto_reboot=True, notify_on_missing=True)
125 125
126 # B('Mac10.6 Sync', 'rel_sync', 'testers', 'mac_rel_trigger', 126 # B('Mac10.6 Sync', 'rel_sync', 'testers', 'mac_rel_trigger',
127 # auto_reboot=True, notify_on_missing=True) 127 # auto_reboot=True, notify_on_missing=True)
128 F('rel_sync', mac_tester().ChromiumFactory( 128 F('rel_sync', mac_tester().ChromiumFactory(
129 slave_type='Tester', 129 slave_type='Tester',
130 build_url=rel_archive, 130 build_url=rel_archive,
131 tests=['sync_integration'], 131 tests=['sync_integration'],
132 factory_properties={'generate_gtest_json': True})) 132 factory_properties={'generate_gtest_json': True}))
133 133
134 ################################################################################ 134 ################################################################################
(...skipping 30 matching lines...) Expand all
165 'gclient_env': { 165 'gclient_env': {
166 'GYP_GENERATORS':'ninja', 166 'GYP_GENERATORS':'ninja',
167 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1' 167 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1'
168 }, 168 },
169 })) 169 }))
170 170
171 # 171 #
172 # Mac Dbg Unit testers 172 # Mac Dbg Unit testers
173 # 173 #
174 174
175 # B('Mac 10.5 Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'mac_dbg_trigger', 175 # B('Mac 10.6 Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'mac_dbg_trigger',
176 # auto_reboot=True, notify_on_missing=True) 176 # auto_reboot=True, notify_on_missing=True)
177 F('dbg_unit_1', mac_tester().ChromiumFactory( 177 F('dbg_unit_1', mac_tester().ChromiumFactory(
178 slave_type='Tester', 178 slave_type='Tester',
179 build_url=dbg_archive, 179 build_url=dbg_archive,
180 target='Debug', 180 target='Debug',
181 tests=[ 181 tests=[
182 'browser_tests', 182 'browser_tests',
183 'cacheinvalidation', 183 'cacheinvalidation',
184 'crypto', 184 'crypto',
185 'googleurl', 185 'googleurl',
186 'gpu', 186 'gpu',
187 'jingle', 187 'jingle',
188 'nacl_integration', 188 'nacl_integration',
189 'printing', 189 'printing',
190 'remoting', 190 'remoting',
191 'safe_browsing', 191 'safe_browsing',
192 ], 192 ],
193 factory_properties={'generate_gtest_json': True, 193 factory_properties={'generate_gtest_json': True,
194 'sharded_tests': sharded_tests, 194 'sharded_tests': sharded_tests,
195 'browser_total_shards': 4, 'browser_shard_index': 1,})) 195 'browser_total_shards': 4, 'browser_shard_index': 1,}))
196 196
197 # B('Mac 10.5 Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'mac_dbg_trigger', 197 # B('Mac 10.6 Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'mac_dbg_trigger',
198 # auto_reboot=True, notify_on_missing=True) 198 # auto_reboot=True, notify_on_missing=True)
199 F('dbg_unit_2', mac_tester().ChromiumFactory( 199 F('dbg_unit_2', mac_tester().ChromiumFactory(
200 slave_type='Tester', 200 slave_type='Tester',
201 build_url=dbg_archive, 201 build_url=dbg_archive,
202 target='Debug', 202 target='Debug',
203 tests=[ 203 tests=[
204 'browser_tests', 204 'browser_tests',
205 'check_deps', 205 'check_deps',
206 'media', 206 'media',
207 'net', 207 'net',
208 ], 208 ],
209 factory_properties={'generate_gtest_json': True, 209 factory_properties={'generate_gtest_json': True,
210 'sharded_tests': sharded_tests, 210 'sharded_tests': sharded_tests,
211 'browser_total_shards': 4, 'browser_shard_index': 2,})) 211 'browser_total_shards': 4, 'browser_shard_index': 2,}))
212 212
213 # B('Mac 10.5 Tests (dbg)(3)', 'dbg_unit_3', 'testers', 'mac_dbg_trigger', 213 # B('Mac 10.6 Tests (dbg)(3)', 'dbg_unit_3', 'testers', 'mac_dbg_trigger',
214 # auto_reboot=True, notify_on_missing=True) 214 # auto_reboot=True, notify_on_missing=True)
215 F('dbg_unit_3', mac_tester().ChromiumFactory( 215 F('dbg_unit_3', mac_tester().ChromiumFactory(
216 slave_type='Tester', 216 slave_type='Tester',
217 build_url=dbg_archive, 217 build_url=dbg_archive,
218 target='Debug', 218 target='Debug',
219 tests=[ 219 tests=[
220 'base', 220 'base',
221 'browser_tests', 221 'browser_tests',
222 'interactive_ui', 222 'interactive_ui',
223 ], 223 ],
224 factory_properties={'generate_gtest_json': True, 224 factory_properties={'generate_gtest_json': True,
225 'sharded_tests': sharded_tests, 225 'sharded_tests': sharded_tests,
226 'browser_total_shards': 4, 'browser_shard_index': 3,})) 226 'browser_total_shards': 4, 'browser_shard_index': 3,}))
227 227
228 # B('Mac 10.5 Tests (dbg)(4)', 'dbg_unit_4', 'testers', 'mac_dbg_trigger', 228 # B('Mac 10.6 Tests (dbg)(4)', 'dbg_unit_4', 'testers', 'mac_dbg_trigger',
229 # auto_reboot=True, notify_on_missing=True) 229 # auto_reboot=True, notify_on_missing=True)
230 F('dbg_unit_4', mac_tester().ChromiumFactory( 230 F('dbg_unit_4', mac_tester().ChromiumFactory(
231 slave_type='Tester', 231 slave_type='Tester',
232 build_url=dbg_archive, 232 build_url=dbg_archive,
233 target='Debug', 233 target='Debug',
234 tests=[ 234 tests=[
235 'browser_tests', 235 'browser_tests',
236 'unit', 236 'unit',
237 ], 237 ],
238 factory_properties={'generate_gtest_json': True, 238 factory_properties={'generate_gtest_json': True,
239 'sharded_tests': sharded_tests, 239 'sharded_tests': sharded_tests,
240 'browser_total_shards': 4, 'browser_shard_index': 4,})) 240 'browser_total_shards': 4, 'browser_shard_index': 4,}))
241 241
242 # B('Mac 10.6 Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'mac_dbg_trigger', 242 ## B('Mac 10.7 Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'mac_dbg_trigger',
243 # auto_reboot=True, notify_on_missing=True) 243 ## auto_reboot=True, notify_on_missing=True)
244 # B('Mac 10.6 Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'mac_dbg_trigger', 244 ## B('Mac 10.7 Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'mac_dbg_trigger',
245 # auto_reboot=True, notify_on_missing=True) 245 ## auto_reboot=True, notify_on_missing=True)
246 # B('Mac 10.6 Tests (dbg)(3)', 'dbg_unit_3', 'testers', 'mac_dbg_trigger', 246 ## B('Mac 10.7 Tests (dbg)(3)', 'dbg_unit_3', 'testers', 'mac_dbg_trigger',
247 # auto_reboot=True, notify_on_missing=True) 247 ## auto_reboot=True, notify_on_missing=True)
248 # B('Mac 10.6 Tests (dbg)(4)', 'dbg_unit_4', 'testers', 'mac_dbg_trigger', 248 ## B('Mac 10.7 Tests (dbg)(4)', 'dbg_unit_4', 'testers', 'mac_dbg_trigger',
249 # auto_reboot=True, notify_on_missing=True) 249 ## auto_reboot=True, notify_on_missing=True)
250 250
251 251
252 def Update(config, active_master, c): 252 def Update(config, active_master, c):
253 return helper.Update(c) 253 return helper.Update(c)
OLDNEW
« no previous file with comments | « masters/master.chromium.mac/master_gatekeeper_cfg.py ('k') | masters/master.chromium.mac/slaves.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698