Rev 40: Test that we can use a different build directories scheme between in file:///home/vila/buildbot/bzr/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Aug 10 09:05:48 BST 2009
At file:///home/vila/buildbot/bzr/
------------------------------------------------------------
revno: 40
revision-id: v.ladeuil+lp at free.fr-20090810080544-cart43wywiuip9yq
parent: v.ladeuil+lp at free.fr-20090810072551-rwdxiyejx8evwrem
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr
timestamp: Mon 2009-08-10 10:05:44 +0200
message:
Test that we can use a different build directories scheme between
slave and master.
* master/master.cfg:
(tests_factory): Factorize and use a dedicated directory to avoid
cluttering the master. Note that this required a master restart to
take the change into account.
-------------- next part --------------
=== modified file 'master/master.cfg'
--- a/master/master.cfg 2009-08-10 07:25:51 +0000
+++ b/master/master.cfg 2009-08-10 08:05:44 +0000
@@ -95,18 +95,18 @@
source,
)
-class BzrMake(shell.ShellCommand):
+class BzrBuildExtensions(shell.ShellCommand):
- name = 'make'
+ name = 'Extensions building'
haltOnFailure = 1
description = ['building C extensions']
descriptionDone = ['C extensions']
command = ['make']
-class BzrSelftest(shell.ShellCommand):
+class BzrTests(shell.ShellCommand):
- name = 'selftest'
+ name = 'Non-regression tests'
haltOnFailure = 1
description = ['running selftest']
descriptionDone = ['selftest']
@@ -128,39 +128,24 @@
bzr_base_URL = "http://bazaar.launchpad.net/"
-bzr_factory = factory.BuildFactory()
-
-#bzr_factory.addStep(source.Bzr(baseURL=bzr_base_URL, defaultBranch='bzr.dev/'))
-bzr_factory.addStep(source.Bzr(
- repourl=bzr_base_URL + '~bzr/bzr/trunk/',
- timeout=3600, # Keep room for initial checkout when needed
-))
-bzr_factory.addStep(BzrMake())
-bzr_factory.addStep(BzrSelftest())
-
-hardy = dict(name='hardy', slavename='hardy',
- builddir='hardy-build',
- factory=bzr_factory,
- )
-jaunty = dict(name='jaunty', slavename='jaunty',
- builddir='jaunty-build',
- factory=bzr_factory,
- )
-tiger = dict(name='tiger', slavename='tiger',
- builddir='tiger-build',
- factory=bzr_factory,
- )
-leopard = dict(name='leopard', slavename='leopard',
- builddir='leopard-build',
- factory=bzr_factory,
- )
-
-w2003x64 = dict(name='w2003x64', slavename='w2003x64',
- builddir='w2003x64-build',
- factory=bzr_factory,
- )
-
-c['builders'] = [hardy, jaunty, tiger, leopard, w2003x64]
+tests_factory = factory.BuildFactory()
+
+tests_factory.addStep(
+ source.Bzr(repourl=bzr_base_URL + '~bzr/bzr/trunk/',
+ timeout=3600, # Keep room for initial checkout when needed
+ ))
+tests_factory.addStep(BzrBuildExtensions())
+tests_factory.addStep(BzrTests())
+
+builders = []
+for s in c['slaves']:
+ name = s.slavename
+ builder = dict(name=name, slavename=name,
+ builddir='tests/%s' % name,
+ factory=tests_factory)
+ builders.append(builder)
+
+c['builders'] = builders
# Factories for the Bazaar Installers for Windows.
#
=== added directory 'master/tests'
More information about the bazaar-commits
mailing list