Rev 41: Use a different directory scheme for installers. in file:///home/vila/buildbot/bzr/

[Vincent Ladeuil]

At file:///home/vila/buildbot/bzr/

------------------------------------------------------------
revno: 41
revision-id: v.ladeuil+lp at free.fr-20090810083057-kju82kc6msb210cv
parent: v.ladeuil+lp at free.fr-20090810080544-cart43wywiuip9yq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr
timestamp: Mon 2009-08-10 10:30:57 +0200
message:
  Use a different directory scheme for installers.
  
  * .bzrignore:
  (tests, installers): Ignore the content on master, the dirs
  themselves on slaves.
  
  * master/master.cfg:
  (installer_factories): Change the directory scheme too. Stop
  building installers for bzr-release (until we got more disk space
  or things get better defined).
-------------- next part --------------
=== modified file '.bzrignore'
--- a/.bzrignore	2009-08-07 15:32:05 +0000
+++ b/.bzrignore	2009-08-10 08:30:57 +0000
@@ -1,9 +1,10 @@
 master/twistd.log
 RE:master/twistd.log.[0-9]+
 master/twistd.pid
-master/*-build/
-RE:master/jaunty-build/[0-9]+.*
+master/tests/*
+master/installers/*
 slaves/*/twistd.log
 RE:slaves/.*/twistd.log.[0-9]+
 slaves/*/twistd.pid
-slaves/*/*-build/*
+slaves/*/tests
+slaves/*/installers

=== modified file 'README'
--- a/README	2009-08-09 15:14:47 +0000
+++ b/README	2009-08-10 08:30:57 +0000
@@ -151,3 +151,11 @@
 
   to repectively look at the service definition or remove it if
   you want to modify some setting.
+
+  Because the installers needs several copys of different
+  versions of bzr, we setup a shared repo (manually) into the
+  installers directory. Note that this should use the current
+  format used by bzr trunk, and that this shared repo can't be
+  used by plugins using a different format.
+
+    bzr init-repo --1.9 slaves/w2003x64/installers

=== added directory 'master/installers'
=== modified file 'master/master.cfg'
--- a/master/master.cfg	2009-08-10 08:05:44 +0000
+++ b/master/master.cfg	2009-08-10 08:30:57 +0000
@@ -137,6 +137,8 @@
 tests_factory.addStep(BzrBuildExtensions())
 tests_factory.addStep(BzrTests())
 
+# Builders for running the non-regression tests
+
 builders = []
 for s in c['slaves']:
     name = s.slavename
@@ -154,10 +156,12 @@
 # release of the plugins, or the other way around.
 
 installer_factories = {}
-for bzr_target in ("release", "dev"):
+#for bzr_target in ("release", "dev"):
+for bzr_target in ("dev"):
     for plugin_target in ("plugin-release", "plugin-dev"):
         f = factory.BuildFactory()
-        name = "bzr-installer-%s-%s" % (bzr_target, plugin_target)
+        combi = '%s-%s' % (bzr_target, plugin_target)
+        name = 'installer-%s' % (combi,)
         steps = [
             source.Bzr(repourl=bzr_base_URL + '~bzr/bzr/trunk/',
                        mode="update", alwaysUseLatest=True,
@@ -185,7 +189,7 @@
     c["builders"].append(
         {"name": name,
          "slavename": 'w2003x64',
-         "builddir": name,
+         "builddir": 'installers/%s' % (name,),
          "factory": factory,
          })