From baec2bbb4cf263e6e2e5039f20c1bf4af21394e8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 16 Mar 2024 17:53:02 +0100
Subject: [PATCH] Running builds view: show build step names
When using Hydra to build machine configurations, you'll often see
"nixosConfigurations.foo" five times, i.e. for each build step being
run. This isn't very helpful I think because in such a case, a single
build step can also be compiling the Linux kernel.
This change also fetches the `drvpath` and `type` from the `buildsteps`
relation. We're already joining it, so this doesn't make much difference
(confirmed via query logging that this doesn't cause extra SQL queries).
Unfortunately build steps don't have a human readable name, so I'm
deriving it from the drvpath by stripping away the hash (assuming that
it'll never contain a `-` and that `/nix/store/` is used as prefix). I
decided against using the Nix bindings for that to avoid too much
overhead due to store operations for each build step.
---
src/lib/Hydra/Controller/Root.pm | 2 +-
src/root/common.tt | 16 +++++++++++++++-
src/root/status.tt | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index a231d7c0..adb5ad44 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -162,7 +162,7 @@ sub status_GET {
{ "buildsteps.busy" => { '!=', 0 } },
{ order_by => ["globalpriority DESC", "id"],
join => "buildsteps",
- columns => [@buildListColumns]
+ columns => [@buildListColumns, 'buildsteps.drvpath', 'buildsteps.type']
})]
);
}
diff --git a/src/root/common.tt b/src/root/common.tt
index 814d08ca..b96cf99c 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -91,6 +91,15 @@ BLOCK renderDuration;
duration % 60 %]s[%
END;
+BLOCK renderDrvInfo;
+ drvname = step.drvpath
+ .substr(11) # strip `/nix/store/`
+ .split('-').slice(1).join("-") # strip hash part
+ .substr(0, -4); # strip `.drv`
+ IF step.type == 0; action = "Build"; ELSE; action = "Substitution"; END;
+ IF drvname; %]<em> ([% action %] of [% drvname %])</em>[% END;
+END;
+
BLOCK renderBuildListHeader %]
<table class="table table-striped table-condensed clickable-rows">
@@ -131,7 +140,12 @@ BLOCK renderBuildListBody;
[% END %]
<td><a class="row-link" href="[% link %]">[% build.id %]</a></td>
[% IF !hideJobName %]
- <td><a href="[%link%]">[% IF !hideJobsetName %][%build.jobset.get_column("project")%]:[%build.jobset.get_column("name")%]:[% END %][%build.get_column("job")%]</td>
+ <td>
+ <a href="[%link%]">[% IF !hideJobsetName %][%build.jobset.get_column("project")%]:[%build.jobset.get_column("name")%]:[% END %][%build.get_column("job")%]</a>
+ [% IF showStepName %]
+ [% INCLUDE renderDrvInfo step=build.buildsteps %]
+ [% END %]
+ </td>
[% END %]
<td class="nowrap">[% t = showSchedulingInfo ? build.timestamp : build.stoptime; IF t; INCLUDE renderRelativeDate timestamp=(showSchedulingInfo ? build.timestamp : build.stoptime); ELSE; "-"; END %]</td>
<td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td>
diff --git a/src/root/status.tt b/src/root/status.tt
index f1ec70b9..e6a07bb7 100644
--- a/src/root/status.tt
+++ b/src/root/status.tt
@@ -7,7 +7,7 @@
[% ELSE %]
- [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 busy=1 %]
+ [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 busy=1 showStepName=1 %]
[% END %]