Merge changes jgh did on krot

[buildfarm-server.git] / templates / log.tt

diff --git a/templates/log.tt b/templates/log.tt
index da255f2ffafe034c40c4905124bd944b0a734cf3..e2ceffdb57c7a6cafe999c9bbdaafee3ee2ccae2 100644 (file)
--- a/templates/log.tt
+++ b/templates/log.tt
@@ -1,6 +1,13 @@
+[%#
+
+Copyright (c) 2003-2010, Andrew Dunstan
+
+See accompanying License file for license details
+
+-%]

 [% PERL %]
        use POSIX qw(ceil);
 [% PERL %]
        use POSIX qw(ceil);

-        my $lrfactor = 6;
+        my $lrfactor = 4;

        $stash->set(lrfactor => $lrfactor);
         my $rows = $stash->get('log_file_names'); 
        my $logrows = ceil(scalar(@$rows)/$lrfactor);
        $stash->set(lrfactor => $lrfactor);
         my $rows = $stash->get('log_file_names'); 
        my $logrows = ceil(scalar(@$rows)/$lrfactor);


@@ -8,17 +15,24 @@
        $stash->set( logcells => $logcells);
        $stash->set( logrows => $logrows ); 
 [% END -%]
        $stash->set( logcells => $logcells);
        $stash->set( logrows => $logrows ); 
 [% END -%]

-[% mytitle = BLOCK %]PostgreSQL BuildFarm | [% IF stage != 'OK' %]Log for system "[% system %]" failure on snapshot taken [% urldt ; ELSE %]Configuration summary for system "[% system %]" snapshot taken [% urldt ; END ; END -%]
+[% mytitle = BLOCK %]Exim BuildFarm | [% IF stage != 'OK' %]Log for system "[% system %]" failure on snapshot taken [% urldt ; ELSE %]Configuration summary for system "[% system %]" snapshot taken [% urldt ; END ; END -%]

 [%
         cvsurl = 'http://anoncvs.postgresql.org/cvsweb.cgi';
 [%
         cvsurl = 'http://anoncvs.postgresql.org/cvsweb.cgi';

-        giturl = scmurl || 'http://git.postgresql.org/gitweb?p=postgresql.git;a=commit;h=';
+        giturl = scmurl || 'http://git.exim.org/gitweb?p=exim.git;a=commit;h=';

 -%]
 [% WRAPPER 'page.tt' 
        title = mytitle
        bodyclass = 'none'
        pagebutton = 'none'
 %]
 -%]
 [% WRAPPER 'page.tt' 
        title = mytitle
        bodyclass = 'none'
        pagebutton = 'none'
 %]

-<h1>PostgreSQL Build Farm Log</h1>
+[%- BLOCK gitlog ;
+       commitref = clog.replace('^commit ([0-9A-Fa-f]+)(.|\n)*','$1');
+       logtail = clog.replace('^commit ([0-9A-Fa-f]+)','');
+       logtail = logtail.replace('\n',' ');
+
+%]<a href="[% giturl ; commitref %]">[% commitref %]</a>[% logtail | html %]
+[% END -%]
+<h1>Exim Build Farm Log</h1>

 <h2>Details for system "[% system %]"[% IF stage != 'OK' %] failure at stage [% stage ; ELSE %], status 'OK'[% END %], snapshot taken [% urldt %]</h2>
 <table cellspacing="0">
     <tr>
 <h2>Details for system "[% system %]"[% IF stage != 'OK' %] failure at stage [% stage ; ELSE %], status 'OK'[% END %], snapshot taken [% urldt %]</h2>
 <table cellspacing="0">
     <tr>


@@ -55,10 +69,10 @@
 [% END %]
 [% cell = 0; FOREACH logstage  IN log_file_names ; striplog = logstage.replace('\.log$','') ; cell = loop.count %]
   [% IF loop.first %] 
 [% END %]
 [% cell = 0; FOREACH logstage  IN log_file_names ; striplog = logstage.replace('\.log$','') ; cell = loop.count %]
   [% IF loop.first %] 

-    <br /> <table><tr><th class='head' rowspan='[% logrows %]'>Stage Logs</th>
+    <br /> <table><tr><th class='head' rowspan='[% logrows %]'>Stage Logs<br /><br />Total run time<br />[% run_time %]</th>

   [% END %]
     [% IF loop.count > 1 and loop.count % lrfactor == 1 %]<tr>[% END %]
   [% END %]
     [% IF loop.count > 1 and loop.count % lrfactor == 1 %]<tr>[% END %]

-    <td><a href='show_stage_log.pl?nm=[% system %]&amp;dt=[% urldt | uri %]&amp;stg=[% striplog %]'>[% striplog %]</a></td>
+    <td><a href='show_stage_log.pl?nm=[% system %]&amp;dt=[% urldt | uri %]&amp;stg=[% striplog %]'>[% striplog %]</a> ([% stage_times.$logstage.stage_duration %])</td>

     [% IF loop.count % lrfactor == 0 %]</tr>[% END %]
 [% END %]
 
     [% IF loop.count % lrfactor == 0 %]</tr>[% END %]
 [% END %]
 


@@ -74,28 +88,68 @@
 <pre>
 [% conf | html %]
 </pre>
 <pre>
 [% conf | html %]
 </pre>

+<table>
+<tr>
+<td valign="top">

 <h3>Files changed this run</h3>
 <h3>Files changed this run</h3>

-<pre>

 [%- IF changed_this_run.0 -%]
 [%- IF changed_this_run.0 -%]

+<pre>

 [%- FOREACH changed IN changed_this_run %]
 <a href="[% IF scm == 'git' ; giturl; changed.1; ELSE ; cvsurl ; changed.0; 'rev='; changed.1; END %]">[% changed.0 ; IF scm == 'cvs'; ' '; changed.1; END %]</a>
 [%- END -%]
 [%- FOREACH changed IN changed_this_run %]
 <a href="[% IF scm == 'git' ; giturl; changed.1; ELSE ; cvsurl ; changed.0; 'rev='; changed.1; END %]">[% changed.0 ; IF scm == 'cvs'; ' '; changed.1; END %]</a>
 [%- END -%]

+</pre>
+[% END %]
+</td>
+<td valign="top" style="padding-left: 10pt;">
+[% IF changed_this_run_logs.0 %]
+<h5>Git log</h5>
+<pre>
+[% IF last_build_git_ref && git_head_ref %]
+<a href="https://github.com/Exim/exim/compare/[% last_build_git_ref %]...[% git_head_ref %]">Change Set for this build</a>
+[% END %]
+[% FOREACH clog IN changed_this_run_logs ; PROCESS gitlog -%]
+[%- END -%]
+</pre>
+</td>

 [%- ELSE %]
 not recorded
 [%- ELSE %]
 not recorded

-[% END -%]

 </pre>
 </pre>

+</td>
+[% END -%]
+</tr>

 [% IF stage != 'OK' %]
 [% IF stage != 'OK' %]

+<tr>
+<td valign="top">

 <h3>Files changed since last success</h3>
 <h3>Files changed since last success</h3>

-<pre>

 [%- IF changed_since_success.0 %]
 [%- IF changed_since_success.0 %]

+<pre>

 [%- FOREACH changed IN changed_since_success %]
 <a href="[% IF scm == 'git' ; giturl; changed.1; ELSE ; cvsurl ; changed.0; 'rev='; changed.1; END %]">[% changed.0 ; IF scm == 'cvs'; ' '; changed.1; END %]</a>
 [%- END -%]
 [%- FOREACH changed IN changed_since_success %]
 <a href="[% IF scm == 'git' ; giturl; changed.1; ELSE ; cvsurl ; changed.0; 'rev='; changed.1; END %]">[% changed.0 ; IF scm == 'cvs'; ' '; changed.1; END %]</a>
 [%- END -%]

+</pre>
+[% END %]
+</td>
+<td valign="top" style="padding-left: 10pt;">
+[% IF changed_since_success_logs.0 %]
+<h5>Git log</h5>
+<pre>
+<a href="https://github.com/Exim/exim/compare/[% last_success_git_ref %]...[% last_build_git_ref %]">Change Set prior to this build</a>
+
+<a href="https://github.com/Exim/exim/compare/[% last_success_git_ref %]...[% git_head_ref %]">Change Set including this build</a>
+
+[% FOREACH clog IN changed_since_success_logs ; PROCESS gitlog -%]
+[%- END -%]
+</pre>
+</td>

 [%- ELSE %]
 [%- ELSE %]

+<pre>

 not recorded
 not recorded

-[% END -%]

 </pre>
 </pre>

+</td>
+[% END -%]
+</tr>

 [% END %]
 [% END %]

+</table>

 <h3>Log</h3>
 <pre>
 [% log | html %]
 <h3>Log</h3>
 <pre>
 [% log | html %]