r2636 - people/goneri/SvnBuildStat-WWW/script

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-05-07 14:46:15 +0000 (Mon, 07 May 2007)
New Revision: 2636

Modified:
   people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl
Log:
some fixes

Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl	2007-05-06 22:49:25 UTC (rev 2635)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl	2007-05-07 14:46:15 UTC (rev 2636)
@@ -17,7 +17,7 @@
 
 my $RELEASE = "0.0.1";
 my $hostname = hostname();
-my $distro = "etch";
+my $distro = "sid";
 
 if ($config->agent_vardir !~ /\/.+/) {
   die "vardir not correclty set in the [agent] section";
@@ -45,12 +45,13 @@
 die if (!-d $pbuilderplace && !mkdir $pbuilderplace);
 die if (!-d $tarballsplace && !mkdir $tarballsplace);
 die if (!-d $tmpdir && !mkdir $tmpdir);
-unlink foreach (<$tmpdir/report*.tar.bz2>);
+unlink foreach (<$tmpdir/report*.tar>);
 
 my %report;
 chomp ($report{'arch'} = `dpkg-architecture -qDEB_HOST_ARCH`);
 $report{'buildadminaddr'} = $config->agent_buildadminaddr;
 $report{hostname} = $hostname;
+$report{distro} = $distro;
 
 $report{'agent_release'} = $RELEASE;
 $report{'svnbp_release'} = `dpkg-query -W -f='\${Version}' svn-buildpackage`;
@@ -71,17 +72,17 @@
 my @tobuild = split /;/, $tobuild;
 my $package = $tobuild[0];
 $report{'source'} = $package;
-my $rev = $tobuild[1];
-my $tarballuri = $tobuild[2];
-my $tarball = $tobuild[3];
-my $svnbase = $tobuild[4];
+my $tarballuri = $tobuild[1];
+my $tarball = $tobuild[2];
+my $svnbase = $tobuild[3];
 
 if (!$package||!$svnbase||!$tarballuri) {
   print "Failed to parse the package information from ".
-  $config->agent_source."/".$report{'arch'};
+  $config->agent_source."/".$report{'arch'}."\n";
   exit 1
 }
-$tarballuri =~ s/\@DEBMIRROR\@/$config->agent_debmirror/;
+my $t = $config->agent_debmirror;
+$tarballuri =~ s/\@DEBMIRROR\@/$t/;
 my $pdebuildparam = "--mirror ".$config->agent_debmirror." --buildplace $pbuilderplace --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz";
 `/usr/sbin/pbuilder update $pdebuildparam >$reportarea/pbuilder-update.log 2>&1`;
 if (($? >> 8)!=0){
@@ -92,21 +93,22 @@
   }
 }
 
+`svn co $svnbase $workplace >$reportarea/svn.log 2>&1`;
+my @tmp = `cd $workplace ; svn log -q --limit 1`;
+chomp($report{'svn_rev'} = $tmp[1]);
+$report{'svn_rev'} =~ s/^r(\d+)\ .*/$1/;
+
 my $ftp = Net::FTP->new($config->agent_ftphost, Debug => 0) or die "Cannot connect
 to ".$config->agent_ftphost.": $@";
 
 $ftp->login($config->agent_ftplogin,$config->agent_ftppassword) or die "Cannot login ", $ftp->message;
 
 print "package: $package\n";
-if (!$ftp->appe($package."_".$rev."_".$report{'arch'}.".lock")) {
+if (!$ftp->appe($package."_".$report{'svn_rev'}."_".$report{'arch'}."_".$distro.".lock")) {
   print "package: $package already locked by a buildbot\n";
   exit 1;
 }
 $ftp->close;
-`svn co $svnbase $workplace >$reportarea/svn.log 2>&1`;
-my @tmp = `cd $workplace ; svn log -q --limit 1`;
-$report{'svn_rev'} = $tmp[1];
-$report{'svn_rev'} =~ s/^r(\d+)\ .*/$1/;
 
 if (!open CTRL, "<$workplace/debian/control") {
   $report{checkout} = 'nok';
@@ -123,13 +125,15 @@
   }
 
   `cd $tarballsplace ; wget -O $tarball -c \"$tarballuri\" >$reportarea/wget.log 2>&1`;
-  if (($? >> 8)!=0) {
+  if (! -f $tarballsplace."/".$tarball) {
+  print "download nok\n";
     $report{'download'} = "nok";
   } else {
+  print "download ok\n";
     $report{'download'} = "ok";
 
     $report{'stamp_build-start'} = time;
-    `cd $workplace ; svn-buildpackage --svn-builder "pdebuild --use-pdebuild-internal -- --buildplace /home/goneri/tmp/debpkgstatus/pbuilder --distribution $distro --basetgz /home/goneri/tmp/debpkgstatus/pbuilder/$distro.tar.gz" --svn-override=origDir=/home/goneri/tmp/debpkgstatus/tarballs --svn-override=buildArea=$buildarea --svn-noninteractive >$reportarea/build.log 2>&1`;
+    `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 2>&1`;
     $report{'stamp_build-end'} = time;
 
     if (<$buildarea/*.deb>) {
@@ -155,8 +159,8 @@
 $ftp = Net::FTP->new($config->agent_ftphost, Debug => 0) or die "Cannot connect
 to ".$config->agent_ftphost.": $@";
 
-my $reporttarball = "$report{'source'}_$report{'svn_rev'}_$report{'arch'}_$hostname.tar.bz2";
+my $reporttarball = "$report{'source'}_$report{'svn_rev'}_$report{'arch'}_$hostname.tar";
 $ftp->login($config->agent_ftplogin,$config->agent_ftppassword) or die "Cannot login ", $ftp->message;
-`cd $tmpdir ; cp -r $reportarea . ; tar cfj  $reporttarball report 2>&1`;
+`cd $tmpdir ; cp -r $reportarea . ; tar cf  $reporttarball report 2>&1`;
 $ftp->put($tmpdir."/".$reporttarball) or warn "Failed to send the report\n";
 $ftp->close or warn "Failed to close the ftp connection to the server\n";