@@ -164,16 +176,24 @@
[% IF step.busy == 0 %]
[% step.stoptime - step.starttime %]s
[% ELSE %]
- [% curTime - step.starttime %]s
+ [% IF build.finished %]
+ [% build.resultInfo.stoptime - step.starttime %]s
+ [% ELSE %]
+ [% curTime - step.starttime %]s
+ [% END %]
[% END %]
[% IF step.busy == 1 %]
- Building
+ [% IF build.finished %]
+ Aborted
+ [% ELSE %]
+ Building
+ [% END %]
[% ELSIF step.status == 0 %]
Succeeded
[% ELSE %]
- Failed: [% step.errormsg %]
+ Failed: [% HTML.escape(step.errormsg) %]
[% END %]
[% IF step.logfile %]
(log)
@@ -190,6 +210,17 @@
[% IF build.finished %]
+[% IF build.resultInfo.errormsg %]
+
+Nix error output
+
+
+[% HTML.escape(build.resultInfo.errormsg) -%]
+
+
+[% END %]
+
+
[% IF build.buildproducts %]
@@ -299,26 +330,6 @@
[% END %]
-[% IF build.buildlogs %]
-
-
-
-[% END %]
-
-
[% IF build.dependents %]
Used by
@@ -349,9 +360,8 @@
Log
-
-[% logtext -%]
+[% HTML.escape(logtext) -%]
diff --git a/src/HydraFrontend/root/log.tt b/src/HydraFrontend/root/log.tt
index a226b6f7..4c491054 100644
--- a/src/HydraFrontend/root/log.tt
+++ b/src/HydraFrontend/root/log.tt
@@ -1,6 +1,6 @@
[% WRAPPER layout.tt title="Hydra Overview" %]
-Build log [% IF step %] of step [% step.stepnr %] [% ELSE %][% log.logphase %][% END %] of build ID [% id %]
+Logfile for [% build.project.name %]:[% build.attrname %] build [% build.id %]
[% logtext -%]
diff --git a/src/HydraFrontend/root/static/css/hydra.css b/src/HydraFrontend/root/static/css/hydra.css
index ce7925c2..91e828d2 100644
--- a/src/HydraFrontend/root/static/css/hydra.css
+++ b/src/HydraFrontend/root/static/css/hydra.css
@@ -153,6 +153,11 @@ td.buildfarmMainColumn {
white-space: pre;
}
+.error {
+ color: red;
+ font-weight: bold;
+}
+
pre.buildlog {
border: 1px solid black;
padding: 0.3em;
diff --git a/src/HydraFrontend/root/static/css/logfile.css b/src/HydraFrontend/root/static/css/logfile.css
index 091662dd..fce99070 100644
--- a/src/HydraFrontend/root/static/css/logfile.css
+++ b/src/HydraFrontend/root/static/css/logfile.css
@@ -75,7 +75,7 @@ em.storeref:hover span.popup {
font-size: larger;
}
-.error {
+.errorLine {
color: #ff0000;
font-weight: bold;
}
diff --git a/src/HydraFrontend/xsl/log2html.xsl b/src/HydraFrontend/xsl/log2html.xsl
index beb3eaf3..9979dc64 100644
--- a/src/HydraFrontend/xsl/log2html.xsl
+++ b/src/HydraFrontend/xsl/log2html.xsl
@@ -63,7 +63,7 @@
- error
+ errorLine
diff --git a/src/build.pl b/src/build.pl
index b61419e5..cd23aa60 100644
--- a/src/build.pl
+++ b/src/build.pl
@@ -27,12 +27,19 @@ sub doBuild {
my $outputCreated = 1; # i.e., the Nix build succeeded (but it could be a positive failure)
my $startTime = 0;
my $stopTime = 0;
+
+ my $buildStatus = 0; # = succeeded
+
+ my $errormsg = undef;
if (!isValidPath($outPath)) {
$isCachedBuild = 0;
$startTime = time();
+ my $thisBuildFailed = 0;
+ my $someBuildFailed = 0;
+
# Run Nix to perform the build, and monitor the stderr output
# to get notifications about specific build steps, the
# associated log files, etc.
@@ -44,6 +51,8 @@ sub doBuild {
open OUT, "$cmd |" or die;
while () {
+ $errormsg .= $_;
+
unless (/^@\s+/) {
print STDERR "$_";
next;
@@ -78,10 +87,12 @@ sub doBuild {
}
elsif (/^@\s+build-failed\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/) {
- my $drvPath = $1;
+ my $drvPathStep = $1;
+ $someBuildFailed = 1;
+ $thisBuildFailed = 1 if $drvPath eq $drvPathStep;
$db->txn_do(sub {
(my $step) = $db->resultset('Buildsteps')->search(
- {id => $build->id, type => 0, drvpath => $drvPath}, {});
+ {id => $build->id, type => 0, drvpath => $drvPathStep}, {});
if ($step) {
die unless $step;
$step->busy(0);
@@ -94,7 +105,7 @@ sub doBuild {
{ id => $build->id
, stepnr => $buildStepNr++
, type => 0 # = build
- , drvpath => $drvPath
+ , drvpath => $drvPathStep
, outpath => $2
, logfile => $4
, busy => 0
@@ -159,17 +170,14 @@ sub doBuild {
$stopTime = time();
- $outputCreated = $res == 0;
- }
+ if ($res != 0) {
+ if ($thisBuildFailed) { $buildStatus = 1; }
+ elsif ($someBuildFailed) { $buildStatus = 2; }
+ else { $buildStatus = 3; }
+ }
- my $buildStatus;
-
- if ($outputCreated) {
- # "Positive" failures, e.g. the builder returned exit code 0
- # but flagged some error condition.
- $buildStatus = -e "$outPath/nix-support/failed" ? 2 : 0;
- } else {
- $buildStatus = 1; # = Nix failure
+ # Only store the output of running Nix if we have a miscellaneous error.
+ $errormsg = undef unless $buildStatus == 3;
}
$db->txn_do(sub {
@@ -177,41 +185,23 @@ sub doBuild {
$build->timestamp(time());
$build->update;
+ my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath;
+ $logPath = undef unless -e $logPath;
+
$db->resultset('Buildresultinfo')->create(
{ id => $build->id
, iscachedbuild => $isCachedBuild
, buildstatus => $buildStatus
, starttime => $startTime
, stoptime => $stopTime
+ , logfile => $logPath
+ , errormsg => $errormsg
});
- my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath;
- if (-e $logPath) {
- print STDERR "found log $logPath\n";
- $db->resultset('Buildlogs')->create(
- { build => $build->id
- , logphase => "full"
- , path => $logPath
- , type => "raw"
- });
- }
-
- if ($outputCreated) {
+ if ($buildStatus == 0) {
my $productnr = 1;
- if (-e "$outPath/log") {
- foreach my $logPath (glob "$outPath/log/*") {
- print STDERR "found log $logPath\n";
- $db->resultset('Buildlogs')->create(
- { build => $build->id
- , logphase => basename($logPath)
- , path => $logPath
- , type => "raw"
- });
- }
- }
-
if (-e "$outPath/nix-support/hydra-build-products") {
open LIST, "$outPath/nix-support/hydra-build-products" or die;
while () {
@@ -251,7 +241,7 @@ sub doBuild {
close LIST;
}
- elsif ($buildStatus == 0) {
+ else {
$db->resultset('Buildproducts')->create(
{ build => $build->id
, productnr => $productnr++
diff --git a/src/hydra.sql b/src/hydra.sql
index 532b4d48..99c7eaad 100644
--- a/src/hydra.sql
+++ b/src/hydra.sql
@@ -2,8 +2,7 @@
-- scheduled builds, additional info (such as the priority) can be
-- found in the BuildSchedulingInfo table. For finished builds,
-- additional info (such as the logs, build products, etc.) can be
--- found in several tables, such as BuildResultInfo, BuildLogs and
--- BuildProducts.
+-- found in several tables, such as BuildResultInfo and BuildProducts.
create table Builds (
id integer primary key autoincrement not null,
@@ -48,14 +47,21 @@ create table BuildResultInfo (
id integer primary key not null,
isCachedBuild integer not null, -- boolean
-
- buildStatus integer, -- 0 = succeeded, 1 = Nix build failure, 2 = positive build failure
+
+ -- Status codes:
+ -- 0 = succeeded
+ -- 1 = build of this derivation failed
+ -- 2 = build of some dependency failed
+ -- 3 = other failure (see errorMsg)
+ buildStatus integer,
errorMsg text, -- error message in case of a Nix failure
startTime integer, -- in Unix time, 0 = used cached build result
stopTime integer,
+ logfile text, -- the path of the logfile
+
foreign key (id) references Builds(id) on delete cascade -- ignored by sqlite
);
@@ -126,16 +132,6 @@ create table BuildProducts (
);
-create table BuildLogs (
- build integer not null,
- logPhase text not null,
- path text not null,
- type text not null,
- primary key (build, logPhase),
- foreign key (build) references Builds(id) on delete cascade -- ignored by sqlite
-);
-
-
-- Emulate "on delete cascade" foreign key constraints.
create trigger cascadeBuildDeletion
before delete on Builds
@@ -143,7 +139,6 @@ create trigger cascadeBuildDeletion
delete from BuildSchedulingInfo where id = old.id;
delete from BuildResultInfo where id = old.id;
delete from BuildInputs where build = old.id;
- delete from BuildLogs where build = old.id;
delete from BuildProducts where build = old.id;
end;
diff --git a/src/test.sql b/src/test.sql
index aaabc823..4aef7cb9 100644
--- a/src/test.sql
+++ b/src/test.sql
@@ -4,8 +4,6 @@ insert into jobSetInputs(project, jobset, name, type) values('patchelf', 'trunk'
insert into jobSetInputAlts(project, jobset, input, altnr, value) values('patchelf', 'trunk', 'patchelfSrc', 0, '/home/eelco/Dev/patchelf-wc');
insert into jobSetInputs(project, jobset, name, type) values('patchelf', 'trunk', 'nixpkgs', 'path');
insert into jobSetInputAlts(project, jobset, input, altnr, value) values('patchelf', 'trunk', 'nixpkgs', 0, '/home/eelco/Dev/nixpkgs-wc');
-insert into jobSetInputs(project, jobset, name, type) values('patchelf', 'trunk', 'release', 'path');
-insert into jobSetInputAlts(project, jobset, input, altnr, value) values('patchelf', 'trunk', 'release', 0, '/home/eelco/Dev/release');
insert into jobSetInputs(project, jobset, name, type) values('patchelf', 'trunk', 'system', 'string');
insert into jobSetInputAlts(project, jobset, input, altnr, value) values('patchelf', 'trunk', 'system', 0, 'i686-linux');
insert into jobSetInputAlts(project, jobset, input, altnr, value) values('patchelf', 'trunk', 'system', 1, 'x86_64-linux');
| 
- Build returned a non-zero exit code
+ Build returned a non-zero exit code
+ [% ELSIF build.resultInfo.buildstatus == 2 %]
+