[Collab-qa-commits] r1126 - in svnbuildstat/trunk: root/lib/site root/src/logs root/src/maintainers root/src/packages root/src/repositorys root/src/teams script
goneri at alioth.debian.org
goneri at alioth.debian.org
Fri Aug 22 22:19:31 UTC 2008
Author: goneri
Date: 2008-08-22 22:19:30 +0000 (Fri, 22 Aug 2008)
New Revision: 1126
Modified:
svnbuildstat/trunk/root/lib/site/html
svnbuildstat/trunk/root/lib/site/layout
svnbuildstat/trunk/root/src/logs/build.tt2
svnbuildstat/trunk/root/src/maintainers/main.tt2
svnbuildstat/trunk/root/src/packages/info.tt2
svnbuildstat/trunk/root/src/packages/main.tt2
svnbuildstat/trunk/root/src/repositorys/main.tt2
svnbuildstat/trunk/root/src/teams/main.tt2
svnbuildstat/trunk/script/svnbuildstat_import-new-report.pl
Log:
save the current changes
Modified: svnbuildstat/trunk/root/lib/site/html
===================================================================
--- svnbuildstat/trunk/root/lib/site/html 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/lib/site/html 2008-08-22 22:19:30 UTC (rev 1126)
@@ -5,8 +5,70 @@
<style type="text/css">
[% PROCESS ttsite.css %]
</style>
+ <script>
+
+var IB=new Object;
+var posX=0;posY=0;
+var xOffset=10;yOffset=10;
+function ShowHelpbox(texte) {
+ contenu="<TABLE border=0><TR bgcolor='white'><TD><TABLE border=0><TR><TD>"+texte+"</TD></TR></TABLE></TD></TR></TABLE>";
+ var finalPosX=posX-xOffset;
+ if (finalPosX<0) finalPosX=0;
+ if (document.layers) {
+ document.layers["bulle"].document.write(contenu);
+ document.layers["bulle"].document.close();
+ document.layers["bulle"].top=posY+yOffset;
+ document.layers["bulle"].left=finalPosX;
+ document.layers["bulle"].visibility="show";}
+ if (document.all) {
+ bulle.innerHTML=contenu;
+ document.all["bulle"].style.top=posY+yOffset;
+ document.all["bulle"].style.left=finalPosX;
+ document.all["bulle"].style.visibility="visible";
+ }
+
+ else if (document.getElementById) {
+ document.getElementById("bulle").innerHTML=contenu;
+ document.getElementById("bulle").style.top=posY+yOffset;
+ document.getElementById("bulle").style.left=finalPosX;
+ document.getElementById("bulle").style.visibility="visible";
+ }
+}
+function getMousePos(e) {
+ if (document.all) {
+ posX=event.x+document.body.scrollLeft;
+ posY=event.y+document.body.scrollTop;
+ }
+ else {
+ posX=e.pageX;
+ posY=e.pageY;
+ }
+}
+function HideHelpBox() {
+ if (document.layers) {document.layers["bulle"].visibility="hide";}
+ if (document.all) {document.all["bulle"].style.visibility="hidden";}
+ else if (document.getElementById){document.getElementById("bulle").style.visibility="hidden";}
+}
+
+function InitHelpBox(ColTexte,ColFond,ColContour,NbPixel) {
+ IB.ColTexte=ColTexte;IB.ColFond=ColFond;IB.ColContour=ColContour;IB.NbPixel=NbPixel;
+ if (document.layers) {
+ window.captureEvents(Event.MOUSEMOVE);window.onMouseMove=getMousePos;
+ document.write("<LAYER name='bulle' top=0 left=0 visibility='hide'></LAYER>");
+ }
+ if (document.all) {
+ document.write("<DIV id='bulle' style='position:absolute;top:0;left:0;visibility:hidden'></DIV>");
+ document.onmousemove=getMousePos;
+ }
+
+ else if (document.getElementById) {
+ document.onmousemove=getMousePos;
+ document.write("<DIV id='bulle' style='position:absolute;top:0;left:0;visibility:hidden'></DIV>");
+ }
+
+}
+
<!-- http://www.webmasterworld.com/forum91/441.htm -->
- <script>
function showhide(id){
if (document.getElementById){
obj = document.getElementById(id);
@@ -20,6 +82,7 @@
</script>
</head>
<body>
+<SCRIPT language="JavaScript">InitHelpBox("#003366","#cccccc","#000000",1);</SCRIPT>
[% content %]
</body>
Modified: svnbuildstat/trunk/root/lib/site/layout
===================================================================
--- svnbuildstat/trunk/root/lib/site/layout 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/lib/site/layout 2008-08-22 22:19:30 UTC (rev 1126)
@@ -7,7 +7,7 @@
<div id="floatmenu">
<div class="menuitem">Welcome</div>
<div class="menusubitem">
-<a href="/repositorys/list">Teams</a></div>
+<a href="/teams/list">Teams</a></div>
<div class="menusubitem"><a href="/maintainers/list">Maintainers</a></div>
<div class="menusubitem"><a href="/contacts/main">Contacts</a></div>
Modified: svnbuildstat/trunk/root/src/logs/build.tt2
===================================================================
--- svnbuildstat/trunk/root/src/logs/build.tt2 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/src/logs/build.tt2 2008-08-22 22:19:30 UTC (rev 1126)
@@ -8,7 +8,7 @@
<h1>[% log.package %] build log ([% log.arch %])</h1>
-[% IF log.buildisok %]
+[% IF log.isbuildok %]
Build succeed
[% ELSE %]
Build failed
Modified: svnbuildstat/trunk/root/src/maintainers/main.tt2
===================================================================
--- svnbuildstat/trunk/root/src/maintainers/main.tt2 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/src/maintainers/main.tt2 2008-08-22 22:19:30 UTC (rev 1126)
@@ -12,7 +12,7 @@
[% # Display each book in a table row %]
[% FOREACH maintainer IN maintainers -%]
<tr>
- <td><a href="[% Catalyst.uri_for('/packages/list/') _ maintainer.email %]"><strong>[% maintainer.name %]</strong></a></td>
+ <td><a href="[% Catalyst.uri_for('/packages/listByMaintainer/') _ maintainer.email %]"><strong>[% maintainer.name %]</strong></a></td>
<td><a href="http://qa.debian.org/developer.php?login=[% maintainer.email %]">QA</a></td>
</tr>
[% END -%]
Modified: svnbuildstat/trunk/root/src/packages/info.tt2
===================================================================
--- svnbuildstat/trunk/root/src/packages/info.tt2 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/src/packages/info.tt2 2008-08-22 22:19:30 UTC (rev 1126)
@@ -89,9 +89,9 @@
<tr><th>Status</th><th>Arch</th><th>Svn Rev.</th><th>Date</th><th>Build duration</th></tr>
[% # Display each book in a table row %]
[% FOREACH build IN builds -%]
- <tr [% IF ! build.buildisok %]class="error"[% ELSE %]class="ok"[% END %]>
+ <tr [% IF ! build.isbuildok %]class="error"[% ELSE %]class="ok"[% END %]>
<td>
- [% IF build.buildisok %]
+ [% IF build.isbuildok %]
<a href="[% Catalyst.uri_for('/logs/build/') _ build.id %]">Success</a>
[% ELSE %]
[% IF build.failedstep == "build" %]
Modified: svnbuildstat/trunk/root/src/packages/main.tt2
===================================================================
--- svnbuildstat/trunk/root/src/packages/main.tt2 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/src/packages/main.tt2 2008-08-22 22:19:30 UTC (rev 1126)
@@ -22,7 +22,7 @@
<td>
<a href="[% Catalyst.uri_for('info/') _ package.name %]"><strong>[% package.name %]</strong></a>
</td>
- <td [% IF ! package.isnative && !package.istarballpresent %]class="error"[% ELSE %][% IF package.builded %][% IF package.buildisok == 0 %]class="error"[% END %][% IF package.buildisok == 1 %]class="ok"[% END %][% END %][% END %]>
+ <td [% IF ! package.isnative && !package.istarballpresent %]class="error"[% ELSE %][% IF package.builded %][% IF package.isbuildok == 0 %]class="error"[% END %][% IF package.isbuildok == 1 %]class="ok"[% END %][% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
[% IF ! package.istarballpresent && ! package.isnative %]
@@ -31,18 +31,18 @@
[% IF ! package.builded %]
Need build
[% ELSE %]
- [% IF package.buildisok == 1 %]ok[% END %]
- [% IF package.buildisok == 0 %]failed[% END %]
+ [% IF package.isbuildok == 1 %]ok[% END %]
+ [% IF package.isbuildok == 0 %]failed[% END %]
[% END %]
[% END %]
</a>
</td>
- <td [% IF package.lintianerrcount > 0 %]class="error"[% ELSE %][% IF package.lintiancount > 0 %]class="warning"[% ELSE %][% IF package.buildisok %]class="ok"[% END %][% END %][% END %]>
+ <td [% IF package.lintianerrcount > 0 %]class="error"[% ELSE %][% IF package.lintiancount > 0 %]class="warning"[% ELSE %][% IF package.isbuildok %]class="ok"[% END %][% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
[% IF package.lintiancount > 0 %][% package.lintiancount %][% END %]
</a>
</td>
- <td [% IF package.lindaerrcount > 0 %]class="error"[% ELSE %][% IF package.lindacount > 0 %]class="warning"[% ELSE %][% IF package.buildisok %]class="ok"[% END %][% END %][% END %]>
+ <td [% IF package.lindaerrcount > 0 %]class="error"[% ELSE %][% IF package.lindacount > 0 %]class="warning"[% ELSE %][% IF package.isbuildok %]class="ok"[% END %][% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
[% IF package.lindacount > 0 %][% package.lindacount %][% END %]
</a>
@@ -54,9 +54,9 @@
[% IF package.bugcount > 0 %][% package.bugcount %][% END %]
</a>
</td>
-<!-- <td [% IF package.piupartsisok %]class="ok"[% ELSE %][% IF package.buildisok %]class="error"[% END %][% END %]>
+<!-- <td [% IF package.piupartsisok %]class="ok"[% ELSE %][% IF package.isbuildok %]class="error"[% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% IF ! package.needbuild && package.buildisok %][% IF package.piupartsisok %]Succeed[% ELSE %]Failed[% END %][% END %]
+ [% IF ! package.needbuild && package.isbuildok %][% IF package.piupartsisok %]Succeed[% ELSE %]Failed[% END %][% END %]
</a>
</td>-->
<td [% IF package.isindebian %]class="ok"[% ELSE %]class="warning"[% END %]>
Modified: svnbuildstat/trunk/root/src/repositorys/main.tt2
===================================================================
--- svnbuildstat/trunk/root/src/repositorys/main.tt2 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/src/repositorys/main.tt2 2008-08-22 22:19:30 UTC (rev 1126)
@@ -8,10 +8,8 @@
<table>
[% FOREACH repository IN repositorys -%]
-[% IF repository.enabled %]
<tr>
-<td><a href="[% Catalyst.uri_for('/packages/list/') _ repository.id %]"><strong>[% repository.name %]</strong></a></td>
+<td><a href="[% Catalyst.uri_for('/packages/list/') _ repository.id %]"><strong>[% repository.uri %]</strong></a></td>
</tr>
[% END -%]
-[% END -%]
</table>
Modified: svnbuildstat/trunk/root/src/teams/main.tt2
===================================================================
--- svnbuildstat/trunk/root/src/teams/main.tt2 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/root/src/teams/main.tt2 2008-08-22 22:19:30 UTC (rev 1126)
@@ -9,7 +9,7 @@
<table>
[% FOREACH team IN teams -%]
<tr>
-<td><a href="[% Catalyst.uri_for('/teams/packages/') _ team.id %]"><strong>[% team.name %]</strong></a></td>
+<td><a href="[% Catalyst.uri_for('/packages/listByTeam/') _ team.id %]"><strong>[% team.name %]</strong></a></td>
</tr>
[% END -%]
</table>
Modified: svnbuildstat/trunk/script/svnbuildstat_import-new-report.pl
===================================================================
--- svnbuildstat/trunk/script/svnbuildstat_import-new-report.pl 2008-08-22 22:18:14 UTC (rev 1125)
+++ svnbuildstat/trunk/script/svnbuildstat_import-new-report.pl 2008-08-22 22:19:30 UTC (rev 1126)
@@ -125,7 +125,37 @@
cleanUp ($dir, $infofile);
return;
}
- my $build = $schema->resultset('Build')->find_or_create({
+
+
+ if (open LOGFILE, "<$infofile->{logfile}") {
+ my $logfileok = 1;
+
+ foreach (<LOGFILE>) {
+ $logfileok = 0 if /tar: Error is not recoverable: exiting now/;
+ }
+
+ close LOGFILE;
+
+ if (!$logfileok) {
+ print ("Logfile error ".$infofile->{id}."\n");
+ error ("Logfile error ".$infofile->{id});
+ cleanUp ($dir, $infofile);
+ return;
+ }
+
+
+ } else {
+
+ print ("Can't parse logfile ".$infofile->{id}."\n");
+ error ("Can't parse logfile ".$infofile->{id});
+ cleanUp ($dir, $infofile);
+ return;
+
+
+}
+
+
+ my $build = $schema->resultset('Build')->create({
changelogentry_id => $changelogentry->id,
arch_id => $arch->id,
# host_id => $host TODO
@@ -133,12 +163,15 @@
$build->time('now');
$build->svndebrelease ($infofile->{release});
- $build->buildisok ($infofile->{build} eq "ok"?"true":"false");
+ $build->isbuildok ($infofile->{build} eq "ok"?"true":"false");
$build->duration($infofile->{'stamp_build-end'}-$infofile->{'stamp_build-start'});
my $fullBuildResultDirectory = SvnBuildStat::Common::getFullBuildResultDirectory(\$build);
my $debTargetDirectory = $fullBuildResultDirectory."/deb";
# my $explodedTargetDirectory = $fullBuildResultDirectory."/exploded";
+ if (-d $fullBuildResultDirectory && &$fullBuildResultDirectory =~ /\/./) {
+ system ("rm -r $fullBuildResultDirectory");
+ }
recurseMkdir($fullBuildResultDirectory);
recurseMkdir($debTargetDirectory);
# recurseMkdir($explodedTargetDirectory);
@@ -205,7 +238,7 @@
}
my $result = parseQaResult($infofile->{'resultfile'});
if (!$result) {
- #cleanUp ($dir, $infofile);
+ cleanUp ($dir, $infofile);
return;
}
@@ -213,7 +246,7 @@
my $qajob = $schema->resultset('Qajob')->search(id => $infofile->{'qajob_id'}, cookie => $infofile->{'cookie'})->first;
if (!$qajob) {
- #cleanUp ($dir, $infofile);
+ cleanUp ($dir, $infofile);
return;
}
@@ -227,11 +260,11 @@
my $qaresultentry = $schema->resultset('Qaresultentry')->find_or_create(
qatag_id => $qatag->id,
text => $_->{qaresultentry},
- qajob_id => $qajob->id
+ qajob_id => $qajob->id,
+ qaseverity_id => $qaseverity->id
);
}
- print $infofile->{'logfile'}."\n";
if ($infofile->{'logfile'}) {
my $fullQajobResultDirectory = getFullQajobResultDirectory(\$qajob);
if (!recurseMkdir ($fullQajobResultDirectory)) {
@@ -248,11 +281,8 @@
$qajob->update;
- #cleanUp ($dir, $infofile);
+ cleanUp ($dir, $infofile);
-
-
-
}
More information about the Collab-qa-commits
mailing list