You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2008/02/06 16:49:57 UTC
svn commit: r619033 - /spamassassin/trunk/build/buildbot/master.cfg
Author: jm
Date: Wed Feb 6 07:49:50 2008
New Revision: 619033
URL: http://svn.apache.org/viewvc?rev=619033&view=rev
Log:
simplify
Modified:
spamassassin/trunk/build/buildbot/master.cfg
Modified: spamassassin/trunk/build/buildbot/master.cfg
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/buildbot/master.cfg?rev=619033&r1=619032&r2=619033&view=diff
==============================================================================
--- spamassassin/trunk/build/buildbot/master.cfg (original)
+++ spamassassin/trunk/build/buildbot/master.cfg Wed Feb 6 07:49:50 2008
@@ -65,7 +65,7 @@
c['bots'] = [
- ("t-feisty", read_pwd("t-feisty-561")),
+ ("t-gutsy", read_pwd("t-feisty-561")),
#generally never up these days
# ("quinlan-freebsd-perl585", read_pwd("quinlan-freebsd-perl585")),
@@ -76,75 +76,6 @@
# ("sidney-win32", read_pwd("sidney-win32")),
]
-# this is the standard set of build steps, with a "make distcheck" and a
-# "make disttest" thrown in, along with a little extra paranoia about being
-# pristine beforehand, and a synch step.
-# the synch step is used to avoid multiple buildbots running in parallel.
-#
-steps = [
- s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/trunk", mode="update"),
- s(shell.Configure, command="perl build/buildbot_ready start perl /tmp/buildbot_sync"),
- s(shell.Configure, command="perl Makefile.PL < /dev/null"),
- s(shell.Compile, command=["make"]),
- s(shell.Test, command=["make", "test"]),
- s(shell.Test, command=["make", "distcheck"]),
- s(shell.Test, command="make disttest < /dev/null"),
- s(shell.Configure, command="perl build/buildbot_ready stop perl /tmp/buildbot_sync"),
- ];
-bf_bugz_73 = factory.BuildFactory(steps)
-
-# b1 = { "name": "t-red-hat-73", "slavename": "bugz-rh73", "builddir": "t-red-hat-73", "factory": bf_bugz_73, }
-# c['builders'].append(b1)
-
-# this is the standard set of build steps, with a "make distcheck" and a
-# "make disttest" thrown in, along with a little extra paranoia about being
-# pristine beforehand.
-#
-steps = [
- s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/trunk", mode="update"),
- s(shell.Configure, command="perl build/buildbot_ready quickstart perl"),
- s(shell.Configure, command="perl Makefile.PL < /dev/null; make distclean; rm -rf Mail-SpamAssassin*"),
- s(shell.Configure, command="perl Makefile.PL < /dev/null"),
- s(shell.Compile, command=["make"]),
- s(shell.Test, command=["make", "test"]),
- s(shell.Test, command=["make", "distcheck"]),
- s(shell.Test, command="make disttest < /dev/null"),
- ];
-bf_generic = factory.BuildFactory(steps)
-
-
-
-# pretty similar to above, but using a specific perl binary
-steps = [
- s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/trunk", mode="update"),
- s(shell.Configure, command="perl build/buildbot_ready start perl /tmp/buildbot_sync"),
- s(shell.Configure, command="/usr/local/perl585thr/bin/perl Makefile.PL < /dev/null"),
- s(shell.Compile, command=["make"]), s(shell.Test, command=["make", "test"]),
- s(shell.Test, command=["make", "distcheck"]),
- s(shell.Test, command="make disttest < /dev/null"),
- s(shell.Configure, command="perl build/buildbot_ready stop perl /tmp/buildbot_sync"),
- ];
-bf_bugz_585thr = factory.BuildFactory(steps)
-# b1 = { "name": "t-585thr", "slavename": "bugz-585-thr", "builddir": "t-585thr", "factory": bf_bugz_585thr, }
-# c['builders'].append(b1)
-
-
-
-# 3.0 branch
-steps = [
- s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/branches/3.0", mode="update"),
- s(shell.Configure, command="perl build/buildbot_ready start perl /tmp/buildbot_sync"),
- s(shell.Configure, command="perl Makefile.PL < /dev/null"),
- s(shell.Compile, command=["make"]), s(shell.Test, command=["make", "test"]),
- s(shell.Test, command=["make", "distcheck"]),
- s(shell.Test, command="make disttest < /dev/null"),
- s(shell.Configure, command="perl build/buildbot_ready stop perl /tmp/buildbot_sync"),
- ];
-bf_bugz_30 = factory.BuildFactory(steps)
-# b1 = { "name": "b3.0-red-hat-73", "slavename": "bugz-rh73", "builddir": "b3.0-red-hat-73", "factory": bf_bugz_30, }
-### c['builders'].append(b1)
-
-# pretty similar to above, but using a specific perl binary
steps = [
s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/trunk", mode="update"),
s(shell.Configure, command="perl build/buildbot_ready start perl /tmp/buildbot_sync"),
@@ -153,21 +84,10 @@
s(shell.Test, command="make disttest < /dev/null"),
s(shell.Configure, command="perl build/buildbot_ready stop perl /tmp/buildbot_sync"),
];
-bf_feisty_561 = factory.BuildFactory(steps)
-b1 = { "name": "t-feisty", "slavename": "t-feisty", "builddir": "t-feisty", "factory": bf_feisty_561, }
+bf_gutsy = factory.BuildFactory(steps)
+b1 = { "name": "t-gutsy", "slavename": "t-gutsy", "builddir": "t-gutsy", "factory": bf_gutsy, }
c['builders'].append(b1)
-
-# now the buildbots that aren't always up...
-
-# b1 = { "name": "mleisi-suse10.2-x86", "slavename": "mleisi-suse10.2-x86", "builddir": "mleisi-suse10.2-x86", "factory": bf_generic, }
-# c['builders'].append(b1)
-#
-# b1 = { "name": "mleisi-suse10.2-x86_64", "slavename": "mleisi-suse10.2-x86_64", "builddir": "mleisi-suse10.2-x86_64", "factory": bf_generic, }
-# c['builders'].append(b1)
-#
-# b1 = { "name": "jm-feisty", "slavename": "jm-feisty", "builddir": "jm-feisty", "factory": bf_generic, }
-# c['builders'].append(b1)
# These are the steps, from Sidney, for building under win32