| 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 # vim: set ft=python: | 4 # vim: set ft=python: |
| 5 | 5 |
| 6 from buildbot.scheduler import Dependent | 6 from buildbot.scheduler import Dependent |
| 7 | 7 |
| 8 from common import chromium_utils | 8 from common import chromium_utils |
| 9 | 9 |
| 10 from master import gitiles_poller | 10 from master import gitiles_poller |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 recipe_master_helper.AddRecipeBasedBuilders( | 71 recipe_master_helper.AddRecipeBasedBuilders( |
| 72 c, slaves, m_annotator, trigger_name_map) | 72 c, slaves, m_annotator, trigger_name_map) |
| 73 | 73 |
| 74 # ---------------------------------------------------------------------------- | 74 # ---------------------------------------------------------------------------- |
| 75 # BUILDER DEFINITIONS | 75 # BUILDER DEFINITIONS |
| 76 | 76 |
| 77 b_android_nexus5 = {'name': 'Android Debug (Nexus 5)', | 77 b_android_nexus5 = {'name': 'Android Debug (Nexus 5)', |
| 78 'factory': F_ANDROID} | 78 'factory': F_ANDROID} |
| 79 b_android_nexus6 = {'name': 'Android Debug (Nexus 6)', | 79 b_android_nexus6 = {'name': 'Android Debug (Nexus 6)', |
| 80 'factory': F_ANDROID} | 80 'factory': F_ANDROID} |
| 81 b_android_nexus9 = {'name': 'Android Debug (Nexus 9)', | |
| 82 'factory': F_ANDROID} | |
| 83 | 81 |
| 84 c['builders'] += [ b_android_nexus5, | 82 c['builders'] += [ b_android_nexus5, |
| 85 b_android_nexus6, | 83 b_android_nexus6 ] |
| 86 b_android_nexus9 ] | |
| 87 | 84 |
| 88 # Associate the slaves to the manual builders. The configuration is in | 85 # Associate the slaves to the manual builders. The configuration is in |
| 89 # slaves.cfg. | 86 # slaves.cfg. |
| 90 for builder in c['builders']: | 87 for builder in c['builders']: |
| 91 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 88 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 92 | 89 |
| 93 ####### BUILDSLAVES | 90 ####### BUILDSLAVES |
| 94 | 91 |
| 95 # The 'slaves' list defines the set of allowable buildslaves. List all the | 92 # The 'slaves' list defines the set of allowable buildslaves. List all the |
| 96 # slaves registered to a builder. Remove dupes. | 93 # slaves registered to a builder. Remove dupes. |
| 97 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], | 94 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], |
| 98 config.Master.GetBotPassword()) | 95 config.Master.GetBotPassword()) |
| 99 | 96 |
| 100 # Make sure everything works together. | 97 # Make sure everything works together. |
| 101 master_utils.VerifySetup(c, slaves) | 98 master_utils.VerifySetup(c, slaves) |
| 102 | 99 |
| 103 ####### STATUS TARGETS | 100 ####### STATUS TARGETS |
| 104 | 101 |
| 105 # Buildbot master url: | 102 # Buildbot master url: |
| 106 # Must come before AutoSetupMaster(). | 103 # Must come before AutoSetupMaster(). |
| 107 c['buildbotURL'] = ActiveMaster.buildbot_url | 104 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 108 | 105 |
| 109 # Adds common status and tools to this master. | 106 # Adds common status and tools to this master. |
| 110 master_utils.AutoSetupMaster(c, ActiveMaster, | 107 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 111 public_html='../master.chromium/public_html', | 108 public_html='../master.chromium/public_html', |
| 112 templates=['../master.chromium/templates'], | 109 templates=['../master.chromium/templates'], |
| 113 tagComparator=master_poller.comparator, | 110 tagComparator=master_poller.comparator, |
| 114 enable_http_status_push=ActiveMaster.is_production_host) | 111 enable_http_status_push=ActiveMaster.is_production_host) |
| OLD | NEW |