| 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.changes import svnpoller | 5 from buildbot.changes import svnpoller |
| 6 from buildbot.scheduler import Scheduler | 6 from buildbot.scheduler import Scheduler |
| 7 from buildbot.scheduler import Triggerable | 7 from buildbot.scheduler import Triggerable |
| 8 | 8 |
| 9 from master import build_utils | 9 from master import build_utils |
| 10 from master import master_config | 10 from master import master_config |
| 11 from master import master_utils | 11 from master import master_utils |
| 12 from master import slaves_list | 12 from master import slaves_list |
| 13 from master.factory import chromium_factory | 13 from master.factory import chromium_factory |
| 14 | 14 |
| 15 import config | 15 import config |
| 16 | 16 |
| 17 ActiveMaster = config.Master.ChromiumPyauto | 17 ActiveMaster = config.Master.ChromiumChromeDriver |
| 18 | 18 |
| 19 # This is the dictionary that the buildmaster pays attention to. We also use | 19 # This is the dictionary that the buildmaster pays attention to. We also use |
| 20 # a shorter alias to save typing. | 20 # a shorter alias to save typing. |
| 21 c = BuildmasterConfig = {} | 21 c = BuildmasterConfig = {} |
| 22 | 22 |
| 23 # Disable compression for the stdio files. | 23 # Disable compression for the stdio files. |
| 24 c['logCompressionLimit'] = False | 24 c['logCompressionLimit'] = False |
| 25 | 25 |
| 26 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 26 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 27 | 27 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 52 | 52 |
| 53 | 53 |
| 54 ####### SCHEDULERS | 54 ####### SCHEDULERS |
| 55 | 55 |
| 56 ## configure the Schedulers | 56 ## configure the Schedulers |
| 57 | 57 |
| 58 # Main scheduler for all changes in trunk. | 58 # Main scheduler for all changes in trunk. |
| 59 s_chromium = Scheduler(name='chromium', | 59 s_chromium = Scheduler(name='chromium', |
| 60 branch='src', | 60 branch='src', |
| 61 treeStableTimer=60, | 61 treeStableTimer=60, |
| 62 builderNames=['Win7 QA', | 62 builderNames=['Win7', |
| 63 'Mac 10.6 QA', | 63 'Mac 10.6', |
| 64 'Linux QA', | 64 'Linux', |
| 65 'Linux32 QA', | 65 'Linux32', |
| 66 ]) | 66 ]) |
| 67 | 67 |
| 68 c['schedulers'] = [s_chromium] | 68 c['schedulers'] = [s_chromium] |
| 69 | 69 |
| 70 ####### BUILDERS | 70 ####### BUILDERS |
| 71 | 71 |
| 72 builders = [] | 72 builders = [] |
| 73 | 73 |
| 74 # ---------------------------------------------------------------------------- | 74 # ---------------------------------------------------------------------------- |
| 75 # FACTORIES | 75 # FACTORIES |
| 76 | 76 |
| 77 m_win = chromium_factory.ChromiumFactory('src/build', 'win32') | 77 m_win = chromium_factory.ChromiumFactory('src/build', 'win32') |
| 78 m_linux = chromium_factory.ChromiumFactory('src/out', 'linux2') | 78 m_linux = chromium_factory.ChromiumFactory('src/out', 'linux2') |
| 79 m_mac = chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin') | 79 m_mac = chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin') |
| 80 | 80 |
| 81 # Some shortcut to simplify the code below. | 81 # Some shortcut to simplify the code below. |
| 82 F_WIN = m_win.ChromiumFactory | 82 F_WIN = m_win.ChromiumFactory |
| 83 F_LINUX = m_linux.ChromiumFactory | 83 F_LINUX = m_linux.ChromiumFactory |
| 84 F_MAC = m_mac.ChromiumFactory | 84 F_MAC = m_mac.ChromiumFactory |
| 85 | 85 |
| 86 f_linux = F_LINUX(target='Release', | 86 f_linux = F_LINUX(target='Release', |
| 87 options=['chromium_builder_chromedriver'], | 87 options=['chromium_builder_chromedriver'], |
| 88 tests=['annotated_steps'], | 88 tests=['annotated_steps'], |
| 89 factory_properties={ | 89 factory_properties={ |
| 90 'annotated_script': 'qa_buildbot_run.py', | 90 'annotated_script': 'chromedriver_buildbot_run.py', |
| 91 'use_xvfb_on_linux': True, | 91 'use_xvfb_on_linux': True, |
| 92 'needs_webdriver_java_tests': True, | 92 'needs_webdriver_java_tests': True, |
| 93 }) | 93 }) |
| 94 | 94 |
| 95 f_win7 = F_WIN(slave_type='Builder', | 95 f_win7 = F_WIN(slave_type='Builder', |
| 96 project='all.sln;chromium_builder_chromedriver', | 96 project='all.sln;chromium_builder_chromedriver', |
| 97 target='Release', | 97 target='Release', |
| 98 tests=['annotated_steps'], | 98 tests=['annotated_steps'], |
| 99 factory_properties={ | 99 factory_properties={ |
| 100 'annotated_script': 'qa_buildbot_run.py', | 100 'annotated_script': 'chromedriver_buildbot_run.py', |
| 101 'trigger': 'win_trigger', | 101 'trigger': 'win_trigger', |
| 102 'needs_webdriver_java_tests': True, | 102 'needs_webdriver_java_tests': True, |
| 103 }) | 103 }) |
| 104 | 104 |
| 105 f_mac_10_6 = F_MAC(slave_type='Builder', | 105 f_mac_10_6 = F_MAC(slave_type='Builder', |
| 106 target='Release', | 106 target='Release', |
| 107 options=['--', '-project', '../build/all.xcodeproj', | 107 options=['--', '-project', '../build/all.xcodeproj', |
| 108 '-target', 'chromium_builder_chromedriver'], | 108 '-target', 'chromium_builder_chromedriver'], |
| 109 tests=['annotated_steps'], | 109 tests=['annotated_steps'], |
| 110 factory_properties={ | 110 factory_properties={ |
| 111 'annotated_script': 'qa_buildbot_run.py', | 111 'annotated_script': 'chromedriver_buildbot_run.py', |
| 112 'needs_webdriver_java_tests': True, | 112 'needs_webdriver_java_tests': True, |
| 113 }) | 113 }) |
| 114 | 114 |
| 115 # ---------------------------------------------------------------------------- | 115 # ---------------------------------------------------------------------------- |
| 116 # BUILDER DEFINITIONS | 116 # BUILDER DEFINITIONS |
| 117 | 117 |
| 118 b_win7 = { | 118 b_win7 = { |
| 119 'name': 'Win7 QA', | 119 'name': 'Win7', |
| 120 'factory': f_win7, | 120 'factory': f_win7, |
| 121 'builddir': 'pyauto_win7', | 121 'builddir': 'chromedriver_win7', |
| 122 'auto_reboot': False | 122 'auto_reboot': False |
| 123 } | 123 } |
| 124 b_linux = { | 124 b_linux = { |
| 125 'name': 'Linux QA', | 125 'name': 'Linux', |
| 126 'factory': f_linux, | 126 'factory': f_linux, |
| 127 'auto_reboot': False | 127 'auto_reboot': False |
| 128 } | 128 } |
| 129 b_linux32 = { | 129 b_linux32 = { |
| 130 'name': 'Linux32 QA', | 130 'name': 'Linux32', |
| 131 'factory': f_linux, | 131 'factory': f_linux, |
| 132 'auto_reboot': False | 132 'auto_reboot': False |
| 133 } | 133 } |
| 134 b_mac10_6 = { | 134 b_mac10_6 = { |
| 135 'name': 'Mac 10.6 QA', | 135 'name': 'Mac 10.6', |
| 136 'factory': f_mac_10_6, | 136 'factory': f_mac_10_6, |
| 137 'builddir': 'pyauto_mac_10_6', | 137 'builddir': 'chromedriver_mac_10_6', |
| 138 'auto_reboot': False | 138 'auto_reboot': False |
| 139 } | 139 } |
| 140 | 140 |
| 141 c['builders'] = [ | 141 c['builders'] = [ |
| 142 b_win7, | 142 b_win7, |
| 143 b_mac10_6, | 143 b_mac10_6, |
| 144 b_linux, | 144 b_linux, |
| 145 b_linux32, | 145 b_linux32, |
| 146 ] | 146 ] |
| 147 | 147 |
| 148 # Associate the slaves to the manual builders. The configuration is in | 148 # Associate the slaves to the manual builders. The configuration is in |
| 149 # slaves.cfg. | 149 # slaves.cfg. |
| 150 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumPyauto') | 150 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumChromeDriver') |
| 151 for builder in c['builders']: | 151 for builder in c['builders']: |
| 152 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 152 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 153 | 153 |
| 154 ####### BUILDSLAVES | 154 ####### BUILDSLAVES |
| 155 | 155 |
| 156 # The 'slaves' list defines the set of allowable buildslaves. List all the | 156 # The 'slaves' list defines the set of allowable buildslaves. List all the |
| 157 # slaves registered to a builder. Remove dupes. | 157 # slaves registered to a builder. Remove dupes. |
| 158 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], | 158 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], |
| 159 config.Master.GetBotPassword()) | 159 config.Master.GetBotPassword()) |
| 160 | 160 |
| 161 # Make sure everything works together. | 161 # Make sure everything works together. |
| 162 master_utils.VerifySetup(c, slaves) | 162 master_utils.VerifySetup(c, slaves) |
| 163 | 163 |
| 164 ####### STATUS TARGETS | 164 ####### STATUS TARGETS |
| 165 | 165 |
| 166 # Adds common status and tools to this master. | 166 # Adds common status and tools to this master. |
| 167 master_utils.AutoSetupMaster(c, ActiveMaster, | 167 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 168 public_html='../master.chromium/public_html', | 168 public_html='../master.chromium/public_html', |
| 169 templates=['../master.chromium/templates'], | 169 templates=['../master.chromium/templates'], |
| 170 enable_http_status_push=ActiveMaster.is_production_host) | 170 enable_http_status_push=ActiveMaster.is_production_host) |
| 171 | 171 |
| 172 ####### PROJECT IDENTITY | 172 ####### PROJECT IDENTITY |
| 173 | 173 |
| 174 # Buildbot master url: | 174 # Buildbot master url: |
| 175 c['buildbotURL'] = 'http://build.chromium.org/buildbot/pyauto/' | 175 c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromedriver/' |
| OLD | NEW |