grahamc/hydra2 - Change MQQ5KZV37LHW6FHJFVND72EH3N5QF64GV6JECJELLWLOZX6XDKZAC

Status page: Show running builds rather than build steps

The active build steps list was redundant, because the "Machine status" page also shows them. So instead show active builds.

Created by Eelco Dolstra on September 25, 2014

MQQ5KZV37LHW6FHJFVND72EH3N5QF64GV6JECJELLWLOZX6XDKZAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/Root.pm at line 102 [7.804]

B:BD[6.22362] → [6.22362:22493]

B:BD[6.22493] → [5.0:63]

∅:D[5.63] → [6.23079:23091]

∅:D[8.193] → [6.23079:23091]

B:BD[6.23079] → [6.23079:23091]

        entity => [ $c->model('DB::BuildSteps')->search(
            { 'me.busy' => 1, 'build.finished' => 0, 'build.busy' => 1 },
            { order_by => [ 'machine' ], join => [ 'build' ] }
        ) ]

[6.22362]

[6.23091]

        entity => [$c->model('DB::Builds')->search({finished => 0, busy => 1}, { order_by => ["priority DESC", "id"]})]

Replacement in src/root/queue.tt at line 4 [9.1]
B:BD[9.93] → [2.0:25]
```
[% IF queue.size == 0 %]
```
[9.93]
[9.122]
```
[% IF resource.size == 0 %]
```

Replacement in src/root/queue.tt at line 6 [9.1]

B:BD[9.123] → [9.123:152]

  <p>The queue is empty.</p>

[9.123]

[9.152]

  <div class="alert alert-info">There are no pending builds.</div>

Replacement in src/root/status.tt at line 1 [10.1151]
B:BD[10.1151] → [11.4398:4449]
```
[% WRAPPER layout.tt title="Active build steps" %]
```
[10.1151]
[10.1197]
```
[% WRAPPER layout.tt title="Running builds" %]
```

Insertion in src/root/status.tt at line 3 [10.1151]

[10.1221]


[% IF resource.size == 0 %]
  <div class="alert alert-info">There are no running builds.</div>
[% ELSE %]

Replacement in src/root/status.tt at line 10 [10.1151]

B:BD[10.1222] → [4.916:983]

∅:D[12.79] → [11.4514:4654]

∅:D[4.983] → [11.4514:4654]

B:BD[11.4514] → [11.4514:4654]

B:BD[11.4654] → [6.35621:35656]

∅:D[6.35656] → [11.4686:5085]

B:BD[11.4686] → [11.4686:5085]

B:BD[11.5085] → [12.80:221]

∅:D[12.221] → [11.5209:5271]

B:BD[11.5209] → [11.5209:5271]

B:BD[11.5271] → [3.665:768]

∅:D[3.768] → [11.5368:5414]

B:BD[11.5368] → [11.5368:5414]

<table class="table table-striped table-condensed clickable-rows">
  <thead>
    <tr><th>Machine</th><th>Job</th><th>Type</th><th>Build</th><th>Step</th><th>What</th><th>Since</th></tr>
  </thead>
  <tbody>
    [% FOREACH step IN resource %]
      <tr>
        <td><tt>[% IF step.machine; step.machine.match('@(.*)').0; ELSE; 'localhost'; END %]</tt></td>
        <td><tt>[% INCLUDE renderFullJobName project = step.build.project.name jobset = step.build.jobset.name job = step.build.job.name %]</tt></td>
        <td><tt>[% step.system %]</tt></td>
        <td><a href="[% c.uri_for('/build' step.build.id) %]">[% step.build.id %]</a></td>
        <td><a class="row-link" href="[% c.uri_for('/build' step.build.id 'nixlog' step.stepnr 'tail-reload') %]">[% step.stepnr %]</a></td>
        <td><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>
        <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
      </tr>
    [% END %]
  </tbody>
</table>

[10.1222]

[10.1244]

  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 %]
[% END %]

Replacement in src/root/topbar.tt at line 24 [15.6671]
∅:D[13.841] → [14.292:331]
B:BD[14.292] → [14.292:331]
```
       title = "Active build steps" %]
```
[13.841]
[16.50]
```
       title = "Running builds" %]
```