grahamc/hydra2 - Change U4TD3AIQXBJFFUORTMIC4IHZTVBORRKL2TZ2FSP4G665ECZOEMNAC

Add support for viewing jobset evaluations

Created by Eelco Dolstra on April 2, 2012

U4TD3AIQXBJFFUORTMIC4IHZTVBORRKL2TZ2FSP4G665ECZOEMNAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 63 [3.1]
B:BD[3.780] → [3.780:822]
```
    $c->stash->{totalBuilds} = $nrBuilds;
```
[3.780]
[3.822]
```
    $c->stash->{total} = $nrBuilds;
```

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 330 [5.104]

[4.1562]


sub evals : Chained('jobset') PathPart('evals') Args(0) {
    my ($self, $c) = @_;
    $c->stash->{template} = 'jobset-evals.tt';

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 337 [5.104]
[4.1563]
[4.1563]
```
    my $page = int($c->req->param('page') || "1") || 1;
```
Insertion in src/lib/Hydra/Controller/Jobset.pm at line 339 [5.104]
[4.1564]
[4.1564]
```
    my $resultsPerPage = 20;
```

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 341 [5.104]

[4.1565]

[5.1141]

    $c->stash->{page} = $page;
    $c->stash->{resultsPerPage} = $resultsPerPage;
    $c->stash->{total} = $c->stash->{jobset}->jobsetevals->search({hasnewbuilds => 1})->count;
    $c->stash->{evals} = [ $c->stash->{jobset}->jobsetevals->search(
        { hasnewbuilds => 1 }, 
        { order_by => "id DESC"
        , '+select' => # !!! Slow - should precompute this.
	    [ "(select count(*) from JobsetEvalMembers where eval = me.id)"
	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 0))" 
	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1))"
	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1 and b.buildStatus = 0))" 
	    ]
	, '+as' => [ "nrBuilds", "nrScheduled", "nrFinished", "nrSucceeded" ]
        , rows => $resultsPerPage
	, page => $page
        }
    ) ];
}

File addition: JobsetEval.pm (----------)

[6.188]

package Hydra::Controller::JobsetEval;
use strict;
use warnings;
use base 'Catalyst::Controller';
use Hydra::Helper::Nix;
use Hydra::Helper::CatalystUtils;
sub eval : Chained('/') PathPart('eval') CaptureArgs(1) {
    my ($self, $c, $evalId) = @_;
    
    my $eval = $c->model('DB::JobsetEvals')->find($evalId)
	or notFound($c, "Evaluation $evalId doesn't exist.");
    $c->stash->{eval} = $eval;
    $c->stash->{project} = $eval->project;
    $c->stash->{jobset} = $eval->jobset;
}
sub view : Chained('eval') PathPart('') Args(0) {
    my ($self, $c) = @_;
    $c->stash->{template} = 'jobset-eval.tt';
    my $eval = $c->stash->{eval};
    my ($eval2) = $eval->jobset->jobsetevals->search(
        { hasnewbuilds => 1, id => { '<', $eval->id } },
        { order_by => "id DESC", rows => 1 });
    my @builds = $eval->builds->search({}, { order_by => ["job", "system", "id"], columns => [@buildListColumns] });
    my @builds2 = $eval2->builds->search({}, { order_by => ["job", "system", "id"], columns => [@buildListColumns] });
    print STDERR "EVAL IS ", $eval2->id, "\n";
    print STDERR scalar(@builds), "\n";
    print STDERR scalar(@builds2), "\n";
    $c->stash->{stillSucceed} = [];
    $c->stash->{stillFail} = [];
    $c->stash->{nowSucceed} = [];
    $c->stash->{nowFail} = [];
    my $n = 0;
    foreach my $build (@builds) {
        my $d;
        while ($n < scalar(@builds2)) {
            my $build2 = $builds2[$n];
            my $d = $build->get_column('job') cmp $build2->get_column('job')
                || $build->get_column('system') cmp $build2->get_column('system');
            #print STDERR $build->id, " ", $build->get_column('job'), " ",  $build->system, " ", $d, "\n";
            last if $d == -1;
            if ($d == 0) {
                #print STDERR $build->buildstatus, "\n";
                #print STDERR $build2->buildstatus, "\n";
                if ($build->buildstatus == 0 && $build2->buildstatus == 0) {
                    push @{$c->stash->{stillSucceed}}, $build;
                } elsif ($build->buildstatus != 0 && $build2->buildstatus != 0) {
                    push @{$c->stash->{stillFail}}, $build;
                } elsif ($build->buildstatus == 0 && $build2->buildstatus != 0) {
                    push @{$c->stash->{nowSucceed}}, $build;
                } elsif ($build->buildstatus != 0 && $build2->buildstatus == 0) {
                    push @{$c->stash->{nowFail}}, $build;
                }
                last;
            }
            $n++;
        }
    }
    
    $c->stash->{full} = ($c->req->params->{full} || "0") eq "1";
}
1;

Replacement in src/root/all.tt at line 10 [7.1038]

B:BD[7.1234] → [7.1234:1297]

out of [% totalBuilds %] in order of descending timestamp.</p>

[7.1234]

[7.1297]

out of [% total %] in order of descending timestamp.</p>

Replacement in src/root/all.tt at line 12 [7.1038]
B:BD[7.1298] → [8.30:52]
∅:D[8.52] → [9.107:111]
B:BD[7.1329] → [9.107:111]
∅:D[9.111] → [10.76:122]
B:BD[7.1329] → [10.76:122]
∅:D[10.122] → [7.1377:1395]
∅:D[11.1366] → [7.1377:1395]
B:BD[7.1377] → [7.1377:1395]
B:BD[7.1395] → [10.123:181]
∅:D[10.181] → [7.1453:1508]
∅:D[11.1420] → [7.1453:1508]
B:BD[7.1453] → [7.1453:1508]
B:BD[7.1508] → [10.182:240]
∅:D[10.240] → [7.1566:1576]
∅:D[11.1474] → [7.1566:1576]
B:BD[7.1566] → [7.1566:1576]
B:BD[7.1576] → [10.241:327]
B:BD[10.327] → [9.112:117]
B:BD[9.117] → [8.53:63]
B:BD[7.1663] → [8.64:89]
```
[% BLOCK renderNav %]
<p>
[<a href="[% "$baseUri?page=1" %]">First</a>]
[% IF page > 1 %]
  [<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
[% END %]
[% IF page * resultsPerPage < totalBuilds %]
  [<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
[% END %]
[<a href="[% "$baseUri?page="; (totalBuilds - 1) div resultsPerPage + 1 %]">Last</a>]
</p>
[% END %]
[% INCLUDE renderNav %]
```
[7.1298]
[2.0]
```
[% INCLUDE renderPager %]
```
Replacement in src/root/all.tt at line 14 [7.1038]
∅:D[2.92] → [8.119:143]
B:BD[8.119] → [8.119:143]
```
[% INCLUDE renderNav %]
```
[2.92]
[8.143]
```
[% INCLUDE renderPager %]
```

Replacement in src/root/common.tt at line 65 [14.2803]

B:BD[12.5096] → [13.353:383]

∅:D[13.383] → [15.0:83]

B:BD[16.737] → [15.0:83]

[%- BLOCK renderBuildList -%]
  <table class="buildList tablesorter[% IF !showSchedulingInfo %] clean[% END %]">

[12.5096]

[16.767]

[%- BLOCK renderBuildListHeader -%]
  <table class="buildList [% IF !unsortable %]tablesorter[% END %] [% IF !showSchedulingInfo %] clean[% END %]">

Insertion in src/root/common.tt at line 92 [14.2803]
[16.1125]
[13.594]
```
[%- END -%]
[%- BLOCK renderBuildListBody -%]
```
Insertion in src/root/common.tt at line 136 [14.2803]
[13.1712]
[16.2177]
```
[%- END -%]
[%- BLOCK renderBuildListFooter -%]
```

Insertion in src/root/common.tt at line 141 [14.2803]

[17.804]

[13.1713]

[%- END -%]
[%- BLOCK renderBuildList -%]
[%- INCLUDE renderBuildListHeader -%]
[%- INCLUDE renderBuildListBody -%]
[%- INCLUDE renderBuildListFooter -%]

Insertion in src/root/common.tt at line 149 [14.2803]
[17.815]
[13.1726]
Deletion in src/root/common.tt at line 393 [14.2803]
B:BD[18.2605] → [18.2605:2629]
```
[% BLOCK buildsGraph %]
```

Insertion in src/root/common.tt at line 394 [14.2803]

[18.2630]

[% BLOCK renderPager %]
<p>
[<a href="[% "$baseUri?page=1" %]">First</a>]
[% IF page > 1 %]
  [<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
[% END %]
[% IF page * resultsPerPage < total %]
  [<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
[% END %]
[<a href="[% "$baseUri?page="; (total - 1) div resultsPerPage + 1 %]">Last</a>]
</p>
[% END %]

Deletion in src/root/common.tt at line 408 [14.2803]
B:BD[18.2632] → [18.2632:2642]
```
[% END %]
```

File addition: jobset-eval.tt (----------)

[6.1486]

[% WRAPPER layout.tt title="Bla" %]
[% PROCESS common.tt %]
<h1>Jobset <tt>[% project.name %]:[% jobset.name %]</tt> Evaluation [% eval.id %]</h1>
<!-- <p>Info on evaluation [% eval.id %]...<p> -->
[%- BLOCK renderSome -%]
  [% size = builds.size; max = full ? size : 30; %]
  [% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1)
       hideProjectName=1 hideJobsetName=1 %]
  [% IF size > max %]
  <tr><td class="centered" colspan="0"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], full => 1) %]"><em>([% size - max %] more builds omitted)</em></a></td></tr>
  [% END %]
[% END %]
[% INCLUDE renderBuildListHeader unsortable=1 %]
[% IF nowFail.size > 0 %]
  <tr><th class="subheader" colspan="0">Builds that now <strong>fail</strong></th></tr>
  [% INCLUDE renderSome builds=nowFail %]
[% END %]
[% IF nowSucceed.size > 0 %]
  <tr><th class="subheader" colspan="0">Builds that now <strong>succeed</strong></th></tr>
  [% INCLUDE renderSome builds=nowSucceed %]
[% END %]
  
[% IF stillFail.size > 0 %]
  <tr><th class="subheader" colspan="0">Builds that still <strong>fail</strong></th></tr>
  [% INCLUDE renderSome builds=stillFail %]
[% END %]
[% IF stillSucceed.size > 0 %]
  <tr><th class="subheader" colspan="0">Builds that still <strong>succeed</strong></th></tr>
  [% INCLUDE renderSome builds=stillSucceed %]
[% END %]
[% INCLUDE renderBuildListFooter %]
[% END %]

File addition: jobset-evals.tt (----------)

[6.1486]

[% WRAPPER layout.tt title="Jobset ‘$project.name:$jobset.name’ evaluations" %]
[% PROCESS common.tt %]
<h1>Evaluations of Jobset <tt>[% INCLUDE renderLink
  uri = c.uri_for(c.controller('Project').action_for('view'), [project.name])
  title = project.name %]:[% jobset.name %]</tt></h1>
  
<p>Showing evaluations [% (page - 1) * resultsPerPage + 1 %] - [%
(page - 1) * resultsPerPage + evals.size %] out of [% total %].</p>
[% INCLUDE renderPager %]
<table class="tablesorter">
  <thead>
    <tr>
      <th>#</th>
      <th>Date</th>
      <th colspan='2'>Success</th>
    </tr>
  </thead>
  <tbody>
    [% last = evals.size - 2; FOREACH n IN [0..last]; eval = evals.$n; m = n + 1; next = evals.$m; %]
     <tr>
       <td><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]">[% eval.id %]</a>&nbsp;</td>
       <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td>
       <td align='right'>
         [% eval.get_column('nrSucceeded') %] / [% eval.get_column('nrBuilds') %]
	 [% IF eval.get_column('nrScheduled') > 0 %]
	 <br />[% eval.get_column('nrScheduled') %] scheduled
	 [% END %]
       </td>
       <td align='right'>
	 [% diff = eval.get_column('nrSucceeded') - next.get_column('nrSucceeded');
	    IF diff > 0 %]
	    <span class='green'><strong>+[% diff %]</strong></span>
	 [% ELSIF diff < 0 && eval.get_column('nrScheduled') == 0 %]
	    <span class='red'><strong>[% diff %]</strong></span>
	 [% END %]
       </td>
     </tr>
    [% END %]
  </tbody>
</table>
[% INCLUDE renderPager %]
[% END %]

Insertion in src/root/navbar.tt at line 48 [19.15137]

[19.17139]

        uri = c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name])
        title = "Evaluations" %]
      [% INCLUDE makeLink

Replacement in src/root/static/css/hydra.css at line 41 [21.8691]

B:BD[20.1361] → [20.1361:1391]

    background-color:#E6EEEE;

[20.1361]

[22.31086]

    background-color: #E6EEEE;
}
th.subheader {
    background-color: #f0f0f8;
    font-size: 120%;
    text-align: center;
    font-weight: normal;

Add support for viewing jobset evaluations

Dependencies

In channels

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 63 [3.1]

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 330 [5.104]

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 337 [5.104]

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 339 [5.104]

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 341 [5.104]

File addition: JobsetEval.pm (----------)

Replacement in src/root/all.tt at line 10 [7.1038]

Replacement in src/root/all.tt at line 12 [7.1038]

Replacement in src/root/all.tt at line 14 [7.1038]

Replacement in src/root/common.tt at line 65 [14.2803]

Insertion in src/root/common.tt at line 92 [14.2803]

Insertion in src/root/common.tt at line 136 [14.2803]

Insertion in src/root/common.tt at line 141 [14.2803]

Insertion in src/root/common.tt at line 149 [14.2803]

Deletion in src/root/common.tt at line 393 [14.2803]

Insertion in src/root/common.tt at line 394 [14.2803]

Deletion in src/root/common.tt at line 408 [14.2803]

File addition: jobset-eval.tt (----------)

File addition: jobset-evals.tt (----------)

Insertion in src/root/navbar.tt at line 48 [19.15137]

Replacement in src/root/static/css/hydra.css at line 41 [21.8691]