bzr-buildbot-net

Merge lp:~sidnei/bzr-buildbot-net/kerguelen-windows-installer into lp:bzr-buildbot-net

  1. kerguelen-windows-installer
  2. Merge into trunk
Proposed by Sidnei da Silva
Status: Merged
Merged at revision: not available
Proposed branch: lp:~sidnei/bzr-buildbot-net/kerguelen-windows-installer
Merge into: lp:bzr-buildbot-net
Diff against target: None lines
To merge this branch: bzr merge lp:~sidnei/bzr-buildbot-net/kerguelen-windows-installer
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+9699@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sidnei da Silva (sidnei) wrote :

Adds the configuration needed to build the installers on kerguelen. A follow branch will include the slave config for kerguelen.

Revision history for this message
Vincent Ladeuil (vila) wrote :

> Adds the configuration needed to build the installers on kerguelen.

Good to go :-) This is already running on the master.

> A follow
> branch will include the slave config for kerguelen.

Great !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'master/master.cfg'
--- master/master.cfg 2009-08-04 16:38:28 +0000
+++ master/master.cfg 2009-08-05 15:07:09 +0000
@@ -14,16 +14,6 @@
14# a shorter alias to save typing.14# a shorter alias to save typing.
15c = BuildmasterConfig = {}15c = BuildmasterConfig = {}
1616
17# We stay simple: builders are named like their associated slave
18bzr_builder_names = [
19 # Ubuntu
20 'hardy',
21 'jaunty',
22 # OSX
23 'tiger',
24 'leopard',
25 ]
26
27####### BUILDSLAVES17####### BUILDSLAVES
2818
29# the 'slaves' list defines the set of allowable buildslaves. Each element is19# the 'slaves' list defines the set of allowable buildslaves. Each element is
@@ -35,6 +25,7 @@
35 BuildSlave('jaunty', 'jackalope'),25 BuildSlave('jaunty', 'jackalope'),
36 BuildSlave('tiger', 'tiger'),26 BuildSlave('tiger', 'tiger'),
37 BuildSlave('leopard', 'leopard'),27 BuildSlave('leopard', 'leopard'),
28 BuildSlave('win2k3-x64', 'win2k3-x64'),
38 ]29 ]
3930
40# to limit to two concurrent builds on a slave, use31# to limit to two concurrent builds on a slave, use
@@ -76,21 +67,6 @@
76#c['change_source'] = PBChangeSource()67#c['change_source'] = PBChangeSource()
7768
7869
79####### SCHEDULERS
80
81## configure the Schedulers
82
83from buildbot import scheduler
84default_scheduler = scheduler.Scheduler(name="all", branch=None,
85 treeStableTimer=2*60,
86 builderNames=bzr_builder_names)
87daily_scheduler = scheduler.Periodic(name='daily',
88 builderNames=bzr_builder_names,
89 periodicBuildTimer=24*60*60)
90
91c['schedulers'] = [daily_scheduler]
92
93
94####### BUILDERS70####### BUILDERS
9571
96# the 'builders' list defines the Builders. Each one is configured with a72# the 'builders' list defines the Builders. Each one is configured with a
@@ -150,13 +126,13 @@
150 shell.ShellCommand.__init__(self, *args, **kwargs)126 shell.ShellCommand.__init__(self, *args, **kwargs)
151127
152128
153bzr_base_URL = 'http://bazaar.launchpad.net/~bzr/bzr/trunk/'129bzr_base_URL = "http://bazaar.launchpad.net/"
154130
155bzr_factory = factory.BuildFactory()131bzr_factory = factory.BuildFactory()
156132
157#bzr_factory.addStep(source.Bzr(baseURL=bzr_base_URL, defaultBranch='bzr.dev/'))133#bzr_factory.addStep(source.Bzr(baseURL=bzr_base_URL, defaultBranch='bzr.dev/'))
158bzr_factory.addStep(source.Bzr(134bzr_factory.addStep(source.Bzr(
159 repourl='http://bazaar.launchpad.net/~bzr/bzr/trunk/'))135 repourl=bzr_base_URL + "~bzr/bzr/trunk/"))
160bzr_factory.addStep(BzrMake())136bzr_factory.addStep(BzrMake())
161bzr_factory.addStep(BzrSelftest())137bzr_factory.addStep(BzrSelftest())
162138
@@ -176,8 +152,71 @@
176 builddir='leopard-build',152 builddir='leopard-build',
177 factory=bzr_factory,153 factory=bzr_factory,
178 )154 )
155
179c['builders'] = [hardy, jaunty, tiger, leopard]156c['builders'] = [hardy, jaunty, tiger, leopard]
180157
158# Factories for the Bazaar Installers for Windows.
159#
160# We'll build a binary for each combination of the plugins and bzr
161# itself, such that people can test say bzr.dev with the current
162# release of the plugins, or the other way around.
163
164# A source lock should be used, such that we can use a shared-repo for
165# the parent directory of the build. Concurrent writes to the
166# shared-repo are not supported, so this is needed.
167from buildbot.locks import SlaveLock
168# from buildbot.steps.transfer import DirectoryUpload
169source_lock = SlaveLock("source")
170
171installer_factories = {}
172for bzr_target in ("release", "dev"):
173 for plugin_target in ("plugin-release", "plugin-dev"):
174 f = factory.BuildFactory()
175 name = "bzr-installer-%s-%s" % (bzr_target, plugin_target)
176 steps = [
177 source.Bzr(
178 repourl=bzr_base_URL + "~jameinel/bzr/1.18-win32-buildbot/",
179 mode="update", alwaysUseLatest=True,
180 timeout=3600, locks=[source_lock]),
181 shell.Compile(
182 command=["make", "installer-all",
183 r"BZR_TARGET=%s" % bzr_target,
184 r"PLUGIN_TARGET=%s" % plugin_target,
185 r"PYTHON=c:/Python25/python.exe",
186 r"PYTHON24=c:/Python24/python.exe",
187 r"PYTHON25=c:/Python25/python.exe",
188 r"PYTHON26=c:/Python26/python.exe"],
189 haltOnFailure=True),
190# DirectoryUpload(slavesrc="tools/win32/installers",
191# masterdest="~/master/public_html/installers/%s" % name,
192# maxsize=None),
193 ]
194 for s in steps:
195 f.addStep(s)
196 installer_factories[name] = f
197
198for name, factory in sorted(installer_factories.iteritems()):
199 c["builders"].append(
200 {"name": name,
201 "slavename": "win2k3-x64",
202 "builddir": name,
203 "factory": factory,
204 })
205
206####### SCHEDULERS
207
208## configure the Schedulers
209
210from buildbot import scheduler
211default_scheduler = scheduler.Scheduler(name="all", branch=None,
212 treeStableTimer=2*60,
213 builderNames=[b["name"] for b in c["builders"]])
214daily_scheduler = scheduler.Periodic(name='daily',
215 builderNames=[b["name"] for b in c["builders"]],
216 periodicBuildTimer=24*60*60)
217
218c['schedulers'] = [daily_scheduler]
219
181220
182####### STATUS TARGETS221####### STATUS TARGETS
183222

Subscribers

People subscribed via source and target branches