| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2014 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 # This is the buildmaster config file for the 'chromium' bot. It must | 8 # This is the buildmaster config file for the 'chromium' bot. It must |
| 9 # be installed as 'master.cfg' in your buildmaster's base directory | 9 # be installed as 'master.cfg' in your buildmaster's base directory |
| 10 # (although the filename can be changed with the --basedir option to | 10 # (although the filename can be changed with the --basedir option to |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 82 |
| 83 ## configure the Schedulers | 83 ## configure the Schedulers |
| 84 | 84 |
| 85 # "FYI" is part of the Win builder name to avoid overwriting the main perf | 85 # "FYI" is part of the Win builder name to avoid overwriting the main perf |
| 86 # waterfall's Win builds. It should be removed once this builder is migrated to | 86 # waterfall's Win builds. It should be removed once this builder is migrated to |
| 87 # chromium.perf. | 87 # chromium.perf. |
| 88 s_chromium = Scheduler(name='chromium', | 88 s_chromium = Scheduler(name='chromium', |
| 89 branch='master', | 89 branch='master', |
| 90 treeStableTimer=60, | 90 treeStableTimer=60, |
| 91 builderNames=['android_oilpan_builder', | 91 builderNames=['android_oilpan_builder', |
| 92 'android_webview_aosp_perf', | |
| 93 'Linux Oilpan Builder', | 92 'Linux Oilpan Builder', |
| 94 'Win x64 FYI Builder', | 93 'Win x64 FYI Builder', |
| 95 'Win Clang Builder', | 94 'Win Clang Builder', |
| 96 ]) | 95 ]) |
| 97 | 96 |
| 98 s_chromium_android_oilpan_rel_trigger = Triggerable('androidrel_oilpan', | 97 s_chromium_android_oilpan_rel_trigger = Triggerable('androidrel_oilpan', |
| 99 ['android_nexus5_oilpan_perf', | 98 ['android_nexus5_oilpan_perf', |
| 100 ]) | 99 ]) |
| 101 | 100 |
| 102 s_chromium_linux_oilpan_rel_trigger = Triggerable( | 101 s_chromium_linux_oilpan_rel_trigger = Triggerable( |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 'auto_reboot': False, | 170 'auto_reboot': False, |
| 172 } | 171 } |
| 173 | 172 |
| 174 # 2. Android | 173 # 2. Android |
| 175 | 174 |
| 176 b_chromium_rel_android_nexus5 = {'name': 'android_nexus5_oilpan_perf', | 175 b_chromium_rel_android_nexus5 = {'name': 'android_nexus5_oilpan_perf', |
| 177 'factory': recipe_factory('android/perf'), | 176 'factory': recipe_factory('android/perf'), |
| 178 'category': '2android|builder_testers', | 177 'category': '2android|builder_testers', |
| 179 } | 178 } |
| 180 | 179 |
| 181 b_webview_aosp_android = {'name': 'android_webview_aosp_perf', | |
| 182 'factory': recipe_factory('android_webview_aosp_perf'), | |
| 183 'category': '2android|builder_testers', | |
| 184 } | |
| 185 | |
| 186 c['builders'] = [ | 180 c['builders'] = [ |
| 187 b_chromium_rel_android_oilpan_builder, | 181 b_chromium_rel_android_oilpan_builder, |
| 188 b_chromium_rel_android_nexus5, | 182 b_chromium_rel_android_nexus5, |
| 189 b_chromium_rel_linux_oilpan_builder, | 183 b_chromium_rel_linux_oilpan_builder, |
| 190 b_chromium_rel_win_x64_builder, | 184 b_chromium_rel_win_x64_builder, |
| 191 b_webview_aosp_android, | |
| 192 ] | 185 ] |
| 193 | 186 |
| 194 # 3. Windows | 187 # 3. Windows |
| 195 | 188 |
| 196 c['builders'].append({'name': 'Win 7 Intel GPU Perf (Xeon)', | 189 c['builders'].append({'name': 'Win 7 Intel GPU Perf (Xeon)', |
| 197 'factory': recipe_factory('chromium'), | 190 'factory': recipe_factory('chromium'), |
| 198 'category': '3windows|builder_testers', | 191 'category': '3windows|builder_testers', |
| 199 }) | 192 }) |
| 200 | 193 |
| 201 # 4. Mac | 194 # 4. Mac |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 | 297 |
| 305 ####### PROJECT IDENTITY | 298 ####### PROJECT IDENTITY |
| 306 | 299 |
| 307 # the 'projectName' string will be used to describe the project that this | 300 # the 'projectName' string will be used to describe the project that this |
| 308 # buildbot is working on. For example, it is used as the title of the | 301 # buildbot is working on. For example, it is used as the title of the |
| 309 # waterfall HTML page. The 'projectURL' string will be used to provide a link | 302 # waterfall HTML page. The 'projectURL' string will be used to provide a link |
| 310 # from buildbot HTML pages to your project's home page. | 303 # from buildbot HTML pages to your project's home page. |
| 311 | 304 |
| 312 c['projectName'] = ActiveMaster.project_name | 305 c['projectName'] = ActiveMaster.project_name |
| 313 c['projectURL'] = config.Master.project_url | 306 c['projectURL'] = config.Master.project_url |
| OLD | NEW |