| 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 buildbot.schedulers.basic import SingleBranchScheduler | 5 from buildbot.schedulers.basic import SingleBranchScheduler |
| 6 | 6 |
| 7 from master.factory import annotator_factory |
| 7 from master.factory import remote_run_factory | 8 from master.factory import remote_run_factory |
| 8 | 9 |
| 9 import master_site_config | 10 import master_site_config |
| 10 ActiveMaster = master_site_config.WebRTC | 11 ActiveMaster = master_site_config.WebRTC |
| 11 | 12 |
| 12 | 13 |
| 13 def m_remote_run(recipe, **kwargs): | 14 def m_remote_run(recipe, **kwargs): |
| 14 return remote_run_factory.RemoteRunFactory( | 15 return remote_run_factory.RemoteRunFactory( |
| 15 active_master=ActiveMaster, | 16 active_master=ActiveMaster, |
| 16 repository='https://chromium.googlesource.com/chromium/tools/build.git', | 17 repository='https://chromium.googlesource.com/chromium/tools/build.git', |
| 17 recipe=recipe, | 18 recipe=recipe, |
| 18 factory_properties={'path_config': 'kitchen'}, | 19 factory_properties={'path_config': 'kitchen'}, |
| 19 **kwargs) | 20 **kwargs) |
| 20 | 21 |
| 21 | 22 |
| 23 m_annotator = annotator_factory.AnnotatorFactory() |
| 24 |
| 25 |
| 22 def Update(c): | 26 def Update(c): |
| 23 c['schedulers'].extend([ | 27 c['schedulers'].extend([ |
| 24 SingleBranchScheduler(name='webrtc_mac_scheduler', | 28 SingleBranchScheduler(name='webrtc_mac_scheduler', |
| 25 branch='master', | 29 branch='master', |
| 26 treeStableTimer=30, | 30 treeStableTimer=30, |
| 27 builderNames=[ | 31 builderNames=[ |
| 28 'Mac64 Debug', | 32 'Mac64 Debug', |
| 29 'Mac64 Release', | 33 'Mac64 Release', |
| 30 'Mac64 Release [large tests]', | 34 'Mac64 Release [large tests]', |
| 31 'Mac64 Debug (GN)', | 35 'Mac64 Debug (GN)', |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 { | 103 { |
| 100 'name': 'iOS API Framework Builder', | 104 'name': 'iOS API Framework Builder', |
| 101 'slavebuilddir': 'mac64', | 105 'slavebuilddir': 'mac64', |
| 102 'recipe': 'webrtc/ios_api_framework', | 106 'recipe': 'webrtc/ios_api_framework', |
| 103 }, | 107 }, |
| 104 ] | 108 ] |
| 105 | 109 |
| 106 c['builders'].extend([ | 110 c['builders'].extend([ |
| 107 { | 111 { |
| 108 'name': spec['name'], | 112 'name': spec['name'], |
| 109 'factory': m_remote_run(spec.get('recipe', 'webrtc/standalone')), | 113 # remote_run is not working for the webrtc/ios recipe: crbug.com/637666. |
| 114 'factory': m_annotator.BaseFactory(spec['recipe']) |
| 115 if 'recipe' in spec and spec['recipe'] == 'webrtc/ios' |
| 116 else m_remote_run('webrtc/standalone'), |
| 110 'notify_on_missing': True, | 117 'notify_on_missing': True, |
| 111 'category': spec.get('category', 'compile|testers'), | 118 'category': spec.get('category', 'compile|testers'), |
| 112 'slavebuilddir': spec['slavebuilddir'], | 119 'slavebuilddir': spec['slavebuilddir'], |
| 113 } for spec in specs | 120 } for spec in specs |
| 114 ]) | 121 ]) |
| OLD | NEW |