| OLD | NEW |
| 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) |
| 11 B = helper.Builder | 11 B = helper.Builder |
| 12 D = helper.Dependent | 12 D = helper.Dependent |
| 13 F = helper.Factory | 13 F = helper.Factory |
| 14 S = helper.Scheduler | 14 S = helper.Scheduler |
| 15 | 15 |
| 16 def win(): return chromium_factory.ChromiumFactory('src/build', 'win32') | 16 def win(): return chromium_factory.ChromiumFactory('src/build', 'win32') |
| 17 | 17 |
| 18 | 18 |
| 19 ################################################################################ | 19 ################################################################################ |
| 20 ## Release | 20 ## Release |
| 21 ################################################################################ | 21 ################################################################################ |
| 22 | 22 |
| 23 defaults['category'] = '1webkit win deps' | 23 defaults['category'] = '1webkit win deps' |
| 24 | 24 |
| 25 # Archive location | 25 # Archive location |
| 26 rel_archive = master_config.GetArchiveUrl('ChromiumWebkit', | 26 rel_archive = master_config.GetArchiveUrl('ChromiumWebkit', |
| 27 'Webkit Win Builder (deps)', | 27 'WebKit Win Builder (deps)', |
| 28 'webkit-win-pinned-rel', 'win32') | 28 'webkit-win-pinned-rel', 'win32') |
| 29 | 29 |
| 30 # | 30 # |
| 31 # Main release scheduler for chromium | 31 # Main release scheduler for chromium |
| 32 # | 32 # |
| 33 S('s1_chromium_rel', branch='src', treeStableTimer=60) | 33 S('s1_chromium_rel', branch='src', treeStableTimer=60) |
| 34 | 34 |
| 35 # | 35 # |
| 36 # Dependent scheduler for the dbg builder | 36 # Dependent scheduler for the dbg builder |
| 37 # | 37 # |
| 38 D('s1_chromium_rel_dep', 's1_chromium_rel') | 38 D('s1_chromium_rel_dep', 's1_chromium_rel') |
| 39 | 39 |
| 40 # | 40 # |
| 41 # Win Rel Builder | 41 # Win Rel Builder |
| 42 # | 42 # |
| 43 B('Webkit Win Builder (deps)', 'f_webkit_win_rel', | 43 B('WebKit Win Builder (deps)', 'f_webkit_win_rel', |
| 44 scheduler='s1_chromium_rel', builddir='webkit-win-pinned-rel') | 44 scheduler='s1_chromium_rel', builddir='webkit-win-pinned-rel') |
| 45 F('f_webkit_win_rel', win().ChromiumFactory( | 45 F('f_webkit_win_rel', win().ChromiumFactory( |
| 46 slave_type='Builder', | 46 slave_type='Builder', |
| 47 project='all.sln;webkit_builder_win')) | 47 project='all.sln;webkit_builder_win')) |
| 48 | 48 |
| 49 # | 49 # |
| 50 # Win Rel Webkit testers | 50 # Win Rel WebKit testers |
| 51 # | 51 # |
| 52 B('Webkit Win (deps)', 'f_webkit_rel_tests', scheduler='s1_chromium_rel_dep') | 52 B('WebKit Win7 (deps)', 'f_webkit_rel_tests', scheduler='s1_chromium_rel_dep') |
| 53 F('f_webkit_rel_tests', win().ChromiumFactory( | 53 F('f_webkit_rel_tests', win().ChromiumFactory( |
| 54 slave_type='Tester', | 54 slave_type='Tester', |
| 55 build_url=rel_archive, | 55 build_url=rel_archive, |
| 56 tests=[ | 56 tests=[ |
| 57 'test_shell', | 57 'test_shell', |
| 58 'webkit', | 58 'webkit', |
| 59 'webkit_lint', | 59 'webkit_lint', |
| 60 'webkit_unit', | 60 'webkit_unit', |
| 61 ], | 61 ], |
| 62 factory_properties={ | 62 factory_properties={ |
| 63 'additional_expectations_files': [ | 63 'additional_expectations_files': [ |
| 64 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], | 64 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], |
| 65 ], | 65 ], |
| 66 'archive_webkit_results': True, | 66 'archive_webkit_results': True, |
| 67 'generate_gtest_json': True, | 67 'generate_gtest_json': True, |
| 68 'test_results_server': 'test-results.appspot.com', | 68 'test_results_server': 'test-results.appspot.com', |
| 69 })) | 69 })) |
| 70 | 70 |
| 71 def Update(config, active_master, c): | 71 def Update(config, active_master, c): |
| 72 return helper.Update(c) | 72 return helper.Update(c) |
| OLD | NEW |