Author: rob
Date: Fri Jun 10 07:36:30 2011
New Revision: 27411
URL: https://svn.nixos.org/websvn/nix/?rev=27411&sc=1
Log:
clean up build page for build that failed with result
Modified:
hydra/trunk/src/lib/Hydra/Controller/Build.pm
hydra/trunk/src/root/build.tt
Modified: hydra/trunk/src/lib/Hydra/Controller/Build.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Controller/Build.pm Thu Jun 9 17:11:56
2011 (r27410)
+++ hydra/trunk/src/lib/Hydra/Controller/Build.pm Fri Jun 10 07:36:30
2011 (r27411)
@@ -54,7 +54,7 @@
(my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr
DESC", rows => 1});
my $path = defined $lastBuildStep ? $lastBuildStep->logfile : "" ;
- if (defined $build->resultInfo && $build->resultInfo->buildstatus == 1 &&
!($path eq "") && -f $lastBuildStep->logfile) {
+ if (defined $build->resultInfo && ($build->resultInfo->buildstatus == 1 ||
$build->resultInfo->buildstatus == 6) && !($path eq "") && -f
$lastBuildStep->logfile) {
$c->stash->{logtext} = `tail -n 50 $path`;
}
Modified: hydra/trunk/src/root/build.tt
==============================================================================
--- hydra/trunk/src/root/build.tt Thu Jun 9 17:11:56 2011 (r27410)
+++ hydra/trunk/src/root/build.tt Fri Jun 10 07:36:30 2011 (r27411)
@@ -180,7 +180,7 @@
[% END %]
[% IF build.finished %]
- [% IF build.buildsteps && build.resultInfo.buildstatus
!= 0 %]
+ [% IF build.buildsteps && build.resultInfo.buildstatus
!= 0 && build.resultInfo.buildstatus != 6 %]
[% INCLUDE renderBuildSteps type="Failed" %]
[% END %]
@@ -190,9 +190,9 @@
<br/>
<table>
<thead>
- <th>Last successful build</th>
- [% IF prevSuccessfulBuild && firstBrokenBuild &&
firstBrokenBuild.id != build.id %]<th>First broken build</th>[% END %]
- <th>This build</th>
+ <th>Last successful build <tt>[% INCLUDE renderDateTime
timestamp = prevSuccessfulBuild.timestamp %]</tt></th>
+ [% IF prevSuccessfulBuild && firstBrokenBuild &&
firstBrokenBuild.id != build.id %]<th>First broken build <tt>[% INCLUDE
renderDateTime timestamp = firstBrokenBuild.timestamp %]</tt></th>[% END %]
+ <th>This build <tt>[% INCLUDE renderDateTime timestamp =
build.timestamp %]</tt></th>
</thead>
<tr>
<td valign="center">[% INCLUDE renderBuildStatusIcon
build=prevSuccessfulBuild size=32 %] [% INCLUDE renderFullBuildLink
build=prevSuccessfulBuild %]</td>
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
