Remove obsolete Builds columns and provide accurate "Running builds"

This removes the "busy", "locker" and "logfile" columns, which are no
longer used by the queue runner. The "Running builds" page now only
shows builds that have an active build step.

src/root/build.tt

@@ -4,7 +4,12 @@
 [% USE HTML %]
 [% USE Date %]
 
-[% isAggregate = constituents.size > 0 %]
+[%
+isAggregate = constituents.size > 0;
+steps = build.buildsteps;
+busy = 0;
+FOR step IN steps; IF step.busy; busy = 1; END; END;
+%]
 
 [% BLOCK renderOutputs %]
   [% start=1; FOREACH output IN outputs %]
@@ -18,7 +23,7 @@
       <tr><th>Nr</th><th>What</th><th>Duration</th><th>Machine</th><th>Status</th></tr>
     </thead>
     <tbody>
-      [% FOREACH step IN build.buildsteps.reverse %]
+      [% FOREACH step IN steps.reverse %]
         [% IF ( type == "All" ) || ( type == "Failed" && step.status != 0 ) || ( type == "Running" && step.busy == 1 ) %]
           [% has_log = seen.${step.drvpath} ? 0 : buildStepLogExists(step);
              seen.${step.drvpath} = 1;
@@ -114,7 +119,7 @@
   [% IF isAggregate %]<li><a href="#tabs-constituents" data-toggle="tab">Constituents</a></li>[% END %]
   <li><a href="#tabs-details" data-toggle="tab">Details</a></li>
   <li><a href="#tabs-buildinputs" data-toggle="tab">Inputs</a></li>
-  [% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
+  [% IF steps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
   [% IF build.dependents %]<li><a href="#tabs-usedby" data-toggle="tab">Used by</a></li>[% END%]
   [% IF drvAvailable %]<li><a href="#tabs-build-deps" data-toggle="tab">Build dependencies</a></li>[% END %]
   [% IF available %]<li><a href="#tabs-runtime-deps" data-toggle="tab">Runtime dependencies</a></li>[% END %]
@@ -138,7 +143,7 @@
             <tr>
               <th>Status:</th>
               <td>
-                [% INCLUDE renderStatus build=build icon=0 %]
+                [% INCLUDE renderStatus build=build icon=0 busy=busy %]
                 [% IF isAggregate;
                      nrConstituents = 0;
                      nrFinished = 0;
@@ -229,14 +234,14 @@
 
     [% END %]
 
-    [% IF build.busy %]
+    [% IF busy %]
       <h3>Running build steps</h3>
       [% INCLUDE renderBuildSteps type="Running" %]
     [% END %]
 
     [% IF build.finished %]
 
-      [% IF build.buildsteps && build.buildstatus != 0 && build.buildstatus != 6 %]
+      [% IF steps && build.buildstatus != 0 && build.buildstatus != 6 %]
         <h3>Failed build steps</h3>
         [% INCLUDE renderBuildSteps type="Failed" %]
       [% END %]
@@ -423,7 +428,7 @@
 
   </div>
 
-  [% IF build.buildsteps %]
+  [% IF steps %]
     <div id="tabs-buildsteps" class="tab-pane">
       [% INCLUDE renderBuildSteps type="All" %]
     </div>

src/root/common.tt

@@ -98,11 +98,11 @@ BLOCK renderBuildListBody;
     <tr>
       [% IF !hideResultInfo %]
         <td>
-          [% INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus %]
+          [% INCLUDE renderBuildStatusIcon size=16 buildstatus=build.buildstatus %]
         </td>
       [% END %]
       [% IF showSchedulingInfo %]
-        <td>[% IF build.busy %]<span class="label label-success">Started</span>[% ELSE %]<span class="label">Queued</span>[% END %]</td>
+        <td>[% IF busy %]<span class="label label-success">Started</span>[% ELSE %]<span class="label">Queued</span>[% END %]</td>
       [% END %]
       <td><a class="row-link" href="[% link %]">[% build.id %]</a></td>
       [% IF !hideJobName %]
@@ -189,7 +189,6 @@ BLOCK renderBuildLink; INCLUDE renderBuildIdLink id=build.id; END;
 
 BLOCK renderBuildStatusIcon;
   finished = build != undef ? build.finished : 1;
-  busy = busy != undef ? busy : build.busy;
   buildstatus = buildstatus != undef ? buildstatus : build.buildstatus;
   IF finished;
     IF buildstatus == 0 %]
@@ -211,10 +210,8 @@ BLOCK renderBuildStatusIcon;
     [% ELSE %]
       <img src="[% c.uri_for("/static/images/error_${size}.png") %]" alt="Failed" class="build-status" />
     [% END;
-  ELSIF busy %]
-    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" alt="Busy" class="build-status" />
-  [% ELSE %]
-    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" alt="Scheduled" class="build-status" />
+  ELSE %]
+    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" alt="Queued" class="build-status" />
   [% END;
 END;
 
@@ -243,9 +240,8 @@ BLOCK renderStatus;
       <span class="error">Aborted</span>
       (Hydra failure; see <a href="#nix-error">below</a>)
     [% END;
-  ELSIF build.busy %]
-    <strong>Build in progress</strong>
-    since [% INCLUDE renderDateTime timestamp = build.starttime;
+  ELSIF busy %]
+    <strong>Build in progress</strong>[%-
   ELSE %]
     <strong>Scheduled to be built</strong>
   [% END;

src/root/jobset-eval.tt

@@ -91,7 +91,7 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
   [% INCLUDE renderBuildListHeader unsortable=1 %]
   [% size = builds.size; max = full ? size : 250; %]
   [% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1)
-       hideProjectName=1 hideJobsetName=1 %]
+       hideProjectName=1 hideJobsetName=1 busy=0 %]
   [% IF size > max; params = c.req.params; params.full = 1 %]
   <tr><td class="centered" colspan="6"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], params) %]"><em>([% size - max %] more builds omitted)</em></a></td></tr>
   [% END %]

src/root/status.tt

@@ -7,7 +7,7 @@
 
 [% ELSE %]
 
-  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 %]
+  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 busy=1 %]
 
 [% END %]