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

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

Powered by Google App Engine
This is Rietveld 408576698