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 2006/03/03 13:35:10 UTC
svn commit: r382787 - in /spamassassin/trunk: build/automc/buildbot_ready
build/automc/freqsd-infrequent build/automc/populate_cor
masses/rule-qa/corpus-hourly masses/rule-qa/corpus.example
Author: jm
Date: Fri Mar 3 04:35:09 2006
New Revision: 382787
URL: http://svn.apache.org/viewcvs?rev=382787&view=rev
Log:
make the URL of the rule-QA app, and the directory the bbmass buildbot slaves run in, configurable settings since they depend on local setup; also, redo the output from the last 'configure' step of the bbmass buildbot to more clearly list the link to the ruleqa reports
Modified:
spamassassin/trunk/build/automc/buildbot_ready
spamassassin/trunk/build/automc/freqsd-infrequent
spamassassin/trunk/build/automc/populate_cor
spamassassin/trunk/masses/rule-qa/corpus-hourly
spamassassin/trunk/masses/rule-qa/corpus.example
Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/buildbot_ready?rev=382787&r1=382786&r2=382787&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Fri Mar 3 04:35:09 2006
@@ -1,13 +1,21 @@
#!/usr/bin/perl
+my $BBMHOME = '/home/bbmass';
+my $BYMAILLOG = '/home/bbmass/bymail/extract.log';
+my $BYMAILCF = '/home/bbmass/bymail/latest.cf';
+my $RULEQAURL = 'http://ruleqa.spamassassin.org/';
+
+ # where do the reporting scripts get run from?
+my $REPORTSCRIPTSADIR = "/home/automc/svn/spamassassin";
+
+# ---------------------------------------------------------------------------
+
use strict;
use warnings;
sub run;
-my $BYMAILLOG = '/home/bbmass/bymail/extract.log';
-my $BYMAILCF = '/home/bbmass/bymail/latest.cf';
-
-my $LOCKDIR = "/home/bbmass/mclocks";
+# directory used to lock between slaves; no longer used
+my $LOCKDIR = "/not/in/use";
my $got_lock = undef;
$|=1;
@@ -106,22 +114,22 @@
my $rev = get_current_svn_revision();
my $slave = get_current_slave_name();
- chdir("masses") or die;
-
- print "FAST FREQS REPORT:\n\n";
- system ("$perl hit-frequencies -c tstrules -x -p -T -s 0");
-
use POSIX qw(strftime);
my $daterev = strftime("%Y%m%d", gmtime(time)) . "-r$rev-b";
- print qq{
+ my $rurl = $RULEQAURL.$daterev;
-BUILDING SLOW FREQS REPORT:
+ chdir("masses") or die;
- http://buildbot.spamassassin.org/ruleqa?daterev=$daterev
+ print "REPORTS\n\n";
+ print "Rule-QA resuts from this mass-check will be published to\n\n";
+ print " $rurl\n\n";
+ print "QUICK FREQS REPORT:\n\n";
-};
+ system ("$perl hit-frequencies -c tstrules -x -p -T -s 0");
+
+ print "\n\nBUILDING SLOW REPORTS:\n\n";
- my $logdir = "/home/bbmass/tmp/logs-r$rev";
+ my $logdir = "$BBMHOME/tmp/logs-r$rev";
if (!-d $logdir) {
run ("mkdir $logdir");
}
@@ -133,13 +141,14 @@
run ("chmod 644 $logdir/ham-$slave.log $logdir/spam-$slave.log");
# run our fast report generator
- $ENV{HOME} = '/home/bbmass';
+ $ENV{HOME} = $BBHOME;
umask(022);
- run ("./rule-qa/corpus-hourly --dir $logdir --tag b");
- run ("./rule-qa/automc/gen_info_xml");
+
+ run ("$REPORTSCRIPTSADIR/masses/rule-qa/corpus-hourly --dir $logdir --tag b");
+ run ("$REPORTSCRIPTSADIR/masses/rule-qa/automc/gen_info_xml");
# enqueue a request for the slow stuff with the report-generation daemon
- run ("../build/automc/freqsd --enq $logdir");
+ run ("$REPORTSCRIPTSADIR/build/automc/freqsd --enq $logdir");
}
# ---------------------------------------------------------------------------
Modified: spamassassin/trunk/build/automc/freqsd-infrequent
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/freqsd-infrequent?rev=382787&r1=382786&r2=382787&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/freqsd-infrequent (original)
+++ spamassassin/trunk/build/automc/freqsd-infrequent Fri Mar 3 04:35:09 2006
@@ -2,6 +2,8 @@
# recreate the corpus link-farm; log results to a web-visible file
+BBMHOME=/home/bbmass
+
(
# create links to the user-submitted corpora in the right
@@ -12,9 +14,10 @@
# permit mass-check processes to create files in these dirs,
# so they can use the ArchiveIterator cache code
- cd /home/bbmass/tmpfs/cor
+ cd $BBMHOME/tmpfs/cor
find . -type d | xargs chmod 1777
) 2>&1 | tee \
/var/www/buildbot.spamassassin.org/bbmass/corpus_makeup.txt
+ # note: needs to be customised for each site
Modified: spamassassin/trunk/build/automc/populate_cor
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/populate_cor?rev=382787&r1=382786&r2=382787&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/populate_cor (original)
+++ spamassassin/trunk/build/automc/populate_cor Fri Mar 3 04:35:09 2006
@@ -3,40 +3,41 @@
# as seen on the zone's "bbmass" mass-checking buildbot
SADIR=/home/automc/svn/spamassassin
+BBMHOME=/home/bbmass
-[ -d /home/bbmass/tmpfs/cor ] || \
- mkdir /home/bbmass/tmpfs/tmp /home/bbmass/tmpfs/cor
+[ -d $BBMHOME/tmpfs/cor ] || \
+ mkdir $BBMHOME/tmpfs/tmp $BBMHOME/tmpfs/cor
-cd /home/bbmass/rawcor
+cd $BBMHOME/rawcor
date
-mkdir /home/bbmass/tmpfs/newcor
+mkdir $BBMHOME/tmpfs/newcor
-TMPDIR=/home/bbmass/tmpfs/tmp \
+TMPDIR=$BBMHOME/tmpfs/tmp \
/local/perl586/bin/perl \
$SADIR/masses/corpora/mk-corpus-link-farm \
-after="6 months ago" \
- -dest /home/bbmass/tmpfs/newcor/mc-fast -num 1000 \
- -dest /home/bbmass/tmpfs/newcor/mc-med -num 5000 \
- -dest /home/bbmass/tmpfs/newcor/mc-slow -num 10000 \
- -dest /home/bbmass/tmpfs/newcor/mc-slower -num 20000 \
+ -dest $BBMHOME/tmpfs/newcor/mc-fast -num 1000 \
+ -dest $BBMHOME/tmpfs/newcor/mc-med -num 5000 \
+ -dest $BBMHOME/tmpfs/newcor/mc-slow -num 10000 \
+ -dest $BBMHOME/tmpfs/newcor/mc-slower -num 20000 \
*
# remove this "out of the way" name, just in case. for some reason
# this seems to occasionally be un-rm'able; Solaris zones bug?
-rm -rf /home/bbmass/tmpfs/cor.old.$$
+rm -rf $BBMHOME/tmpfs/cor.old.$$
# and put the new corpus linkfarm in place...
-mv /home/bbmass/tmpfs/cor /home/bbmass/tmpfs/cor.old.$$
-mv /home/bbmass/tmpfs/newcor /home/bbmass/tmpfs/cor
+mv $BBMHOME/tmpfs/cor $BBMHOME/tmpfs/cor.old.$$
+mv $BBMHOME/tmpfs/newcor $BBMHOME/tmpfs/cor
# remove the old one (or try, at least)
-rm -rf /home/bbmass/tmpfs/cor.old.$$
+rm -rf $BBMHOME/tmpfs/cor.old.$$
for dir in mc-fast mc-med mc-slow mc-slower
do
-echo "ham:dir:/home/bbmass/tmpfs/cor/$dir/ham
-spam:dir:/home/bbmass/tmpfs/cor/$dir/spam" > /home/bbmass/tmpfs/cor/$dir/targets
+echo "ham:dir:$BBMHOME/tmpfs/cor/$dir/ham
+spam:dir:$BBMHOME/tmpfs/cor/$dir/spam" > $BBMHOME/tmpfs/cor/$dir/targets
done
date
Modified: spamassassin/trunk/masses/rule-qa/corpus-hourly
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/corpus-hourly?rev=382787&r1=382786&r2=382787&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus-hourly (original)
+++ spamassassin/trunk/masses/rule-qa/corpus-hourly Fri Mar 3 04:35:09 2006
@@ -432,7 +432,7 @@
print qq{created: $bytes bytes, finished at $when
URL:
- http://buildbot.spamassassin.org/ruleqa/$output_revpath
+ $opt{ruleqa_url}$output_revpath
};
Modified: spamassassin/trunk/masses/rule-qa/corpus.example
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/corpus.example?rev=382787&r1=382786&r2=382787&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus.example (original)
+++ spamassassin/trunk/masses/rule-qa/corpus.example Fri Mar 3 04:35:09 2006
@@ -44,3 +44,6 @@
# "mass-check" command.
# pre_mass_check_command=/path/to/script
+# the URL of the ruleqa web application.
+ruleqa_url=http://ruleqa.spamassassin.org/
+