r3434 - people/goneri/SvnBuildStat-WWW/script

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-07-18 17:40:40 +0000 (Wed, 18 Jul 2007)
New Revision: 3434

Modified:
   people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl
Log:
use ccache and implify piuparts check


Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl	2007-07-18 09:53:14 UTC (rev 3433)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl	2007-07-18 17:40:40 UTC (rev 3434)
@@ -29,6 +29,7 @@
 my $buildarea = $config->agent_vardir."/build-area";
 my $reportarea = $config->agent_vardir."/report";
 my $tmpdir = $config->agent_vardir."/tmp";
+my $ccachedir = $config->agent_vardir."/ccache";
 $ENV{LC_ALL} = 'C';
 $ENV{LANG} = 'C';
 
@@ -46,8 +47,18 @@
 die if (!-d $pbuilderplace && !mkdir $pbuilderplace);
 die if (!-d $tarballsplace && !mkdir $tarballsplace);
 die if (!-d $tmpdir && !mkdir $tmpdir);
+die if (!-d $ccachedir && !mkdir $ccachedir);
+die if (!-d $ccachedir."/cache" && !mkdir $ccachedir."/cache");
 unlink foreach (<$tmpdir/report*.tar>);
 
+open CCACHECFG, ">$ccachedir/ccache.cfg" or die;
+print CCACHECFG "export CCACHE_DIR=\"$ccachedir/cache\"\n";
+print CCACHECFG "export PATH=\"/usr/lib/ccache:\${PATH}\"\n";
+print CCACHECFG "export CCACHE_NOCOMPRESS=\"1\"\n";
+print CCACHECFG "EXTRAPACKAGES=ccache\n";
+print CCACHECFG "BINDMOUNTS=\"\${CCACHE_DIR}\"\n";
+close CCACHECFG;
+
 my %report;
 chomp ($report{'arch'} = `dpkg-architecture -qDEB_HOST_ARCH`);
 $report{'buildadminaddr'} = $config->agent_buildadminaddr;
@@ -83,16 +94,16 @@
   exit 1
 }
 my $t = $config->agent_debmirror;
-my $pdebuildparam = "--mirror ".$config->agent_debmirror." --buildplace $pbuilderplace --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz";
+my $pdebuildparam = "--mirror ".$config->agent_debmirror." --buildplace $pbuilderplace --othermirror 'deb ".$config->agent_debmirror." $distro main contrib non-free' --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz";
 `/usr/sbin/pbuilder update $pdebuildparam >$reportarea/pbuilder-update.log 2>&1`;
 if (($? >> 8)!=0){
+  print "`/usr/sbin/pbuilder create $pdebuildparam >$reportarea/pbuilder-create.log 2>&1`";
   `/usr/sbin/pbuilder create $pdebuildparam >$reportarea/pbuilder-create.log 2>&1`;
   if (($? >> 8)!=0) {
     print "Failed to create pbuilder image\n";
     exit 1
   }
 }
-
 foreach (`LC_ALL=C svn info $svnbase`) {
 	$report{'svn_rev'} = $1 if /Last Changed Rev:\ (\d+)/;
 }
@@ -154,7 +165,7 @@
 
   if ($report{'download'} ne "nok") {
     $report{'stamp_build-start'} = time;
-    `cd $workplace ; svn-buildpackage --svn-builder "pdebuild --use-pdebuild-internal -- --buildplace $pbuilderplace --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz" --svn-override=origDir=$tarballsplace --svn-override=buildArea=$buildarea --svn-noninteractive >$reportarea/build.log.tmp 2>&1`;
+    `cd $workplace ; svn-buildpackage --svn-builder "pdebuild --use-pdebuild-internal --configfile $ccachedir/ccache.cfg -- --buildplace $pbuilderplace --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz" --svn-override=origDir=$tarballsplace --svn-override=buildArea=$buildarea --svn-noninteractive >$reportarea/build.log.tmp 2>&1`;
     $report{'stamp_build-end'} = time;
 
 # To avoid breakage with tar
@@ -174,7 +185,8 @@
       $report{build} = "ok"; 
       `cd $buildarea ; lintian --allow-root *.deb *.dsc > $reportarea/lintian.log`;
       `cd $buildarea ; linda --show-tag *.deb *.dsc 2>/dev/null > $reportarea/linda.log`;
-      `cd $buildarea ; /usr/sbin/piuparts -d etch -d lenny -d sid *.deb | grep -v DEBUG > $reportarea/piuparts.log`;
+      `cd $buildarea ; /usr/sbin/piuparts *.deb | grep -v DEBUG > $reportarea/piuparts.log`;
+      $report{piuparts} = (($? >> 8)==0)?'ok':'nok';
     } else {
       $report{build} = "nok";
     }