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 2007/06/15 17:35:01 UTC
svn commit: r547713 - in /spamassassin/trunk/build: automc/automc-by-mail
automc/etc-init.d-bbmass automc/run_preflight buildbot/bbmass_master.cfg
Author: jm
Date: Fri Jun 15 08:35:00 2007
New Revision: 547713
URL: http://svn.apache.org/viewvc?view=rev&rev=547713
Log:
remove mc-med buildbot; we don't really need so many after all, I think, and this reduces load a little
Modified:
spamassassin/trunk/build/automc/automc-by-mail
spamassassin/trunk/build/automc/etc-init.d-bbmass
spamassassin/trunk/build/automc/run_preflight
spamassassin/trunk/build/buildbot/bbmass_master.cfg
Modified: spamassassin/trunk/build/automc/automc-by-mail
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/automc-by-mail?view=diff&rev=547713&r1=547712&r2=547713
==============================================================================
--- spamassassin/trunk/build/automc/automc-by-mail (original)
+++ spamassassin/trunk/build/automc/automc-by-mail Fri Jun 15 08:35:00 2007
@@ -28,7 +28,7 @@
# name of the Buildbot slaves to trigger
my @SLAVES = qw(
- mc-fast mc-med mc-slow mc-slower
+ mc-fast mc-slow mc-slower
);
Modified: spamassassin/trunk/build/automc/etc-init.d-bbmass
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/etc-init.d-bbmass?view=diff&rev=547713&r1=547712&r2=547713
==============================================================================
--- spamassassin/trunk/build/automc/etc-init.d-bbmass (original)
+++ spamassassin/trunk/build/automc/etc-init.d-bbmass Fri Jun 15 08:35:00 2007
@@ -16,7 +16,6 @@
runall () {
su buildbot -c "buildbot $1 /export/home/buildbot/bots/bbmass"
nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-fast"
- nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-med"
nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-slow"
nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-slower"
}
Modified: spamassassin/trunk/build/automc/run_preflight
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/run_preflight?view=diff&rev=547713&r1=547712&r2=547713
==============================================================================
--- spamassassin/trunk/build/automc/run_preflight (original)
+++ spamassassin/trunk/build/automc/run_preflight Fri Jun 15 08:35:00 2007
@@ -26,10 +26,10 @@
my %mass_check_args = (
- 'mc-fast' => '--tail=1000',
- 'mc-med' => '--tail=6000 --head=5000',
- 'mc-slow' => '--tail=16000 --head=10000',
- 'mc-slower' => '--tail=36000 --head=20000',
+ 'mc-fast' => '--tail=2000',
+ 'mc-med' => '--tail=12000 --head=10000',
+ 'mc-slow' => '--tail=22000 --head=10000',
+ 'mc-slower' => '--tail=42000 --head=20000',
);
Modified: spamassassin/trunk/build/buildbot/bbmass_master.cfg
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/buildbot/bbmass_master.cfg?view=diff&rev=547713&r1=547712&r2=547713
==============================================================================
--- spamassassin/trunk/build/buildbot/bbmass_master.cfg (original)
+++ spamassassin/trunk/build/buildbot/bbmass_master.cfg Fri Jun 15 08:35:00 2007
@@ -62,7 +62,6 @@
c['bots'] = [
("mc-fast", read_pwd("mc-fast")),
- ("mc-med", read_pwd("mc-med")),
("mc-slow", read_pwd("mc-slow")),
("mc-slower", read_pwd("mc-slower")),
]
@@ -85,9 +84,6 @@
b1 = { "name": "mc-fast", "slavename": "mc-fast", "builddir": "mc-fast", "factory": bf_mc_generic, }
c['builders'].append(b1)
-b1 = { "name": "mc-med", "slavename": "mc-med", "builddir": "mc-med", "factory": bf_mc_generic, }
-c['builders'].append(b1)
-
b1 = { "name": "mc-slow", "slavename": "mc-slow", "builddir": "mc-slow", "factory": bf_mc_generic, }
c['builders'].append(b1)
@@ -103,10 +99,9 @@
from buildbot import scheduler
sched1 = scheduler.Scheduler("sched1", None, 10*60, ["mc-fast"])
-sched2 = scheduler.Scheduler("sched2", None, 20*60, ["mc-med"])
-sched3 = scheduler.Scheduler("sched3", None, 30*60, ["mc-slow"])
-sched4 = scheduler.Scheduler("sched4", None, 40*60, ["mc-slower"])
-c['schedulers'] = [sched1,sched2,sched3,sched4]
+sched3 = scheduler.Scheduler("sched2", None, 20*60, ["mc-slow"])
+sched4 = scheduler.Scheduler("sched3", None, 30*60, ["mc-slower"])
+c['schedulers'] = [sched1,sched2,sched3]
###########################################################################