Merge pull request #887 from helsinki-systems/feat/eval-overview-duration

Show evaluation time in the evaluations overview
This commit is contained in:
Graham Christensen 2021-06-29 10:59:02 -04:00 committed by GitHub
commit e02f34722f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions

View file

@ -3,13 +3,14 @@ package Hydra::View::TT;
use strict; use strict;
use base 'Catalyst::View::TT'; use base 'Catalyst::View::TT';
use Hydra::Helper::Nix; use Hydra::Helper::Nix;
use Time::Seconds;
__PACKAGE__->config( __PACKAGE__->config(
TEMPLATE_EXTENSION => '.tt', TEMPLATE_EXTENSION => '.tt',
ENCODING => 'utf-8', ENCODING => 'utf-8',
PRE_CHOMP => 1, PRE_CHOMP => 1,
POST_CHOMP => 1, POST_CHOMP => 1,
expose_methods => [qw/buildLogExists buildStepLogExists jobExists stripSSHUser/]); expose_methods => [qw/buildLogExists buildStepLogExists jobExists relativeDuration stripSSHUser/]);
sub buildLogExists { sub buildLogExists {
my ($self, $c, $build) = @_; my ($self, $c, $build) = @_;
@ -25,6 +26,27 @@ sub buildStepLogExists {
return defined findLog($c, $step->drvpath, @outPaths); return defined findLog($c, $step->drvpath, @outPaths);
} }
=head2 relativeDuration
Given an integer of seconds, return an English representation of the
duration as a string.
Arguments:
=over 1
=item C<$seconds>
An integer number of seconds
=back
=cut
sub relativeDuration {
my ($self, $c, $seconds) = @_;
return Time::Seconds->new($seconds)->pretty();
}
sub stripSSHUser { sub stripSSHUser {
my ($self, $c, $name) = @_; my ($self, $c, $name) = @_;
if ($name =~ /^.*@(.*)$/) { if ($name =~ /^.*@(.*)$/) {

View file

@ -88,6 +88,7 @@
<td> <td>
[% IF latestEval %] [% IF latestEval %]
[% INCLUDE renderDateTime timestamp = latestEval.timestamp %] [% INCLUDE renderDateTime timestamp = latestEval.timestamp %]
(took [% relativeDuration (latestEval.checkouttime + latestEval.evaltime) %])
[% ELSE %] [% ELSE %]
<em>never</em> <em>never</em>
[% END %] [% END %]