| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 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 from buildbot.changes import svnpoller | 8 from buildbot.changes import svnpoller |
| 9 from buildbot.scheduler import Scheduler | 9 from buildbot.scheduler import Scheduler |
| 10 | 10 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 # autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the | 76 # autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the |
| 77 # base class, and is configured with a series of BuildSteps. When the build | 77 # base class, and is configured with a series of BuildSteps. When the build |
| 78 # is run, the appropriate buildslave is told to execute each Step in turn. | 78 # is run, the appropriate buildslave is told to execute each Step in turn. |
| 79 | 79 |
| 80 # the first BuildStep is typically responsible for obtaining a copy of the | 80 # the first BuildStep is typically responsible for obtaining a copy of the |
| 81 # sources. There are source-obtaining Steps in buildbot/process/step.py for | 81 # sources. There are source-obtaining Steps in buildbot/process/step.py for |
| 82 # CVS, SVN, and others. | 82 # CVS, SVN, and others. |
| 83 | 83 |
| 84 builders = [] | 84 builders = [] |
| 85 | 85 |
| 86 def SetupSwarmTests(machine, options=None, project=None): | 86 def SetupSwarmTests(machine, data_dest_dir, options=None, project=None): |
| 87 return machine.SwarmFactory( | 87 return machine.SwarmFactory( |
| 88 tests=['base_unittests', 'net_unittests'], | 88 tests=['base_unittests', 'net_unittests'], |
| 89 options=options, | 89 options=options, |
| 90 project=project, | 90 project=project, |
| 91 factory_properties={ | 91 factory_properties={ |
| 92 'gclient_env' : { | 92 'gclient_env' : { |
| 93 'GYP_DEFINES': 'tests_run=hashtable', | 93 'GYP_DEFINES': 'tests_run=hashtable', |
| 94 'GYP_MSVS_VERSION': '2010', | 94 'GYP_MSVS_VERSION': '2010', |
| 95 }, | 95 }, |
| 96 'data_server' : 'http://vm155-m1:8080/', |
| 97 'data_dest_dir' : data_dest_dir, |
| 96 'swarm_server' : 'http://vm155-m1:9001/'}) | 98 'swarm_server' : 'http://vm155-m1:9001/'}) |
| 97 | 99 |
| 98 | 100 |
| 99 # ---------------------------------------------------------------------------- | 101 # ---------------------------------------------------------------------------- |
| 100 # FACTORIES | 102 # FACTORIES |
| 101 | 103 |
| 102 m_linux = swarm_factory.SwarmFactory( | 104 m_linux = swarm_factory.SwarmFactory( |
| 103 'src/build', | 105 'src/build', |
| 104 target_platform='linux2', | 106 target_platform='linux2', |
| 105 full_checkout=True) | 107 full_checkout=True) |
| 106 f_chromium_linux_swarm = SetupSwarmTests( | 108 f_chromium_linux_swarm = SetupSwarmTests( |
| 107 m_linux, | 109 m_linux, |
| 110 # TODO(csharp): Make this a variable in site_config |
| 111 '/etc/swarm-data', |
| 108 options=['chromium_swarm_tests']) | 112 options=['chromium_swarm_tests']) |
| 109 | 113 |
| 110 m_win = swarm_factory.SwarmFactory( | 114 m_win = swarm_factory.SwarmFactory( |
| 111 'src/build', | 115 'src/build', |
| 112 target_platform='win32', | 116 target_platform='win32', |
| 113 full_checkout=True) | 117 full_checkout=True) |
| 114 f_chromium_win_swarm = SetupSwarmTests( | 118 f_chromium_win_swarm = SetupSwarmTests( |
| 115 m_win, | 119 m_win, |
| 120 '\\\\fas2-110\\swarm-data', |
| 116 project='all.sln;chromium_swarm_tests') | 121 project='all.sln;chromium_swarm_tests') |
| 117 | 122 |
| 118 m_mac = swarm_factory.SwarmFactory( | 123 m_mac = swarm_factory.SwarmFactory( |
| 119 'src/build', | 124 'src/build', |
| 120 target_platform='darwin', | 125 target_platform='darwin', |
| 121 full_checkout=True) | 126 full_checkout=True) |
| 122 f_chromium_mac_swarm = SetupSwarmTests( | 127 f_chromium_mac_swarm = SetupSwarmTests( |
| 123 m_mac, | 128 m_mac, |
| 129 '/etc/swarm-data', |
| 124 options=['--', '-target', 'chromium_swarm_tests']) | 130 options=['--', '-target', 'chromium_swarm_tests']) |
| 125 | 131 |
| 126 # ---------------------------------------------------------------------------- | 132 # ---------------------------------------------------------------------------- |
| 127 # BUILDER DEFINITIONS | 133 # BUILDER DEFINITIONS |
| 128 | 134 |
| 129 b_chromium_linux_swarm_1 = { | 135 b_chromium_linux_swarm_1 = { |
| 130 'name': 'Linux Swarm Tests (1)', | 136 'name': 'Linux Swarm Tests (1)', |
| 131 'builddir': 'chromium-linux-swarm-1', | 137 'builddir': 'chromium-linux-swarm-1', |
| 132 'factory': f_chromium_linux_swarm, | 138 'factory': f_chromium_linux_swarm, |
| 133 } | 139 } |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 master_utils.AutoSetupMaster(c, ActiveMaster, | 176 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 171 public_html="../master.chromium.git/public_html", | 177 public_html="../master.chromium.git/public_html", |
| 172 templates=['../master.chromium/templates'], | 178 templates=['../master.chromium/templates'], |
| 173 enable_http_status_push=ActiveMaster.is_production_host) | 179 enable_http_status_push=ActiveMaster.is_production_host) |
| 174 | 180 |
| 175 ####### PROJECT IDENTITY | 181 ####### PROJECT IDENTITY |
| 176 | 182 |
| 177 c['projectName'] = ActiveMaster.project_name | 183 c['projectName'] = ActiveMaster.project_name |
| 178 c['projectURL'] = config.Master.project_url | 184 c['projectURL'] = config.Master.project_url |
| 179 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.swarm/' | 185 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.swarm/' |
| OLD | NEW |