- | Job [% input.build.project %]:[% input.build.attrname %] build [% input.build.id %] |
+ Job [% input.build.project.name %]:[% input.build.attrname %] build [% input.build.id %] |
[% input.name %] |
[% input.build.system %] |
[% date.format(input.build.timestamp, '%Y-%m-%d %H:%M:%S') %] |
diff --git a/src/HydraFrontend/root/index.tt b/src/HydraFrontend/root/index.tt
index 483663c1..d10ffe10 100644
--- a/src/HydraFrontend/root/index.tt
+++ b/src/HydraFrontend/root/index.tt
@@ -1,4 +1,25 @@
[% WRAPPER layout.tt title="Hydra Overview" %]
+[% USE date %]
+
+Queue
+
+
+
+ | Priority | Project | Job | System | Timestamp | Description |
|---|
+
+
+ [% FOREACH job IN jobs -%]
+
+ | [% job.priority %] |
+ [% job.project.name %] |
+ [% job.jobset.name %] |
+ [% job.system %] |
+ [% date.format(job.timestamp, '%Y-%m-%d %H:%M:%S') %] |
+ [% job.description %] |
+
+ [% END -%]
+
+
Job status
diff --git a/src/HydraFrontend/root/short-build-info.tt b/src/HydraFrontend/root/short-build-info.tt
index 12990614..a3549b70 100644
--- a/src/HydraFrontend/root/short-build-info.tt
+++ b/src/HydraFrontend/root/short-build-info.tt
@@ -9,8 +9,8 @@
[% END %]
[% build.id %] |
- [% build.project %] |
- [% build.attrname %] |
+ [% build.project.name %] |
+ [% build.attrname %] |
[% build.system %] |
[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %] |
[% build.description %] |
diff --git a/src/hydra.sql b/src/hydra.sql
index ae3dfddb..5cbce7cf 100644
--- a/src/hydra.sql
+++ b/src/hydra.sql
@@ -4,7 +4,7 @@ create table builds (
-- Info about the inputs.
project text not null, -- !!! foreign key
- jobSet text not null, -- !!! foreign key
+ jobset text not null, -- !!! foreign key
attrName text not null,
-- Info about the build result.
@@ -16,7 +16,10 @@ create table builds (
errorMsg text, -- error message in case of a Nix failure
startTime integer, -- in Unix time, 0 = used cached build result
stopTime integer,
- system text not null
+ system text not null,
+
+ foreign key (project) references projects(name), -- ignored by sqlite
+ foreign key (project, jobset) references jobsets(project, name) -- ignored by sqlite
);
@@ -28,7 +31,7 @@ create table inputs (
build integer,
job integer,
- -- Copied from the jobSetInputs from which the build was created.
+ -- Copied from the jobsetinputs from which the build was created.
name text not null,
type text not null,
uri text,
@@ -83,29 +86,29 @@ create table projects (
-- A jobset consists of a set of inputs (e.g. SVN repositories), one
-- of which contains a Nix expression containing an attribute set
-- describing build jobs.
-create table jobSets (
+create table jobsets (
name text not null,
project text not null,
description text,
- nixExprInput text not null, -- name of the jobSetInput containing the Nix expression
+ nixExprInput text not null, -- name of the jobsetInput containing the Nix expression
nixExprPath text not null, -- relative path of the Nix expression
primary key (project, name),
foreign key (project) references projects(name) on delete cascade, -- ignored by sqlite
- foreign key (project, name, nixExprInput) references jobSetInputs(project, job, name)
+ foreign key (project, name, nixExprInput) references jobsetInputs(project, job, name)
);
-create table jobSetInputs (
+create table jobsetInputs (
project text not null,
jobset text not null,
name text not null,
type text not null, -- "svn", "cvs", "path", "file", "string"
primary key (project, jobset, name),
- foreign key (project, jobset) references jobSets(project, name) on delete cascade -- ignored by sqlite
+ foreign key (project, jobset) references jobsets(project, name) on delete cascade -- ignored by sqlite
);
-create table jobSetInputAlts (
+create table jobsetInputAlts (
project text not null,
jobset text not null,
input text not null,
@@ -118,7 +121,7 @@ create table jobSetInputAlts (
value text, -- for type == 'string'
primary key (project, jobset, input, altnr),
- foreign key (project, jobset, input) references jobSetInputs(project, jobset, name) on delete cascade -- ignored by sqlite
+ foreign key (project, jobset, input) references jobsetInputs(project, jobset, name) on delete cascade -- ignored by sqlite
);
@@ -127,15 +130,21 @@ create table jobs (
timestamp integer not null, -- time this build was added to the db (in Unix time)
priority integer not null,
+
+ busy integer not null, -- true means someone is building this job now
+ locker text not null, -- !!! hostname/pid of the process building this job?
-- Info about the inputs.
project text not null, -- !!! foreign key
- jobSet text not null, -- !!! foreign key
+ jobset text not null, -- !!! foreign key
attrName text not null,
-- What this job will build.
description text,
drvPath text not null,
outPath text not null,
- system text not null
+ system text not null,
+
+ foreign key (project) references projects(name), -- ignored by sqlite
+ foreign key (project, jobset) references jobsets(project, name) -- ignored by sqlite
);
diff --git a/src/scheduler.pl b/src/scheduler.pl
index 66c75082..74fe6979 100644
--- a/src/scheduler.pl
+++ b/src/scheduler.pl
@@ -16,7 +16,7 @@ sub isValidPath {
sub buildJob {
- my ($project, $jobset, $jobName, $drvPath, $outPath, $usedInputs, $system) = @_;
+ my ($project, $jobset, $jobName, $description, $drvPath, $outPath, $usedInputs, $system) = @_;
if (scalar($db->resultset('Builds')->search({project => $project->name, jobset => $jobset->name, attrname => $jobName, outPath => $outPath})) > 0) {
print " already done\n";
@@ -58,6 +58,7 @@ sub buildJob {
, project => $project->name
, jobset => $jobset->name
, attrname => $jobName
+ , description => $description
, drvpath => $drvPath
, outpath => $outPath
, iscachedbuild => $isCachedBuild
@@ -175,17 +176,17 @@ sub checkJob {
my $infoXml = `nix-env -f $nixExprPath --query --available "*" --attr-path --out-path --drv-path --meta --xml --system-filter "*" --attr $jobName $extraArgs`
or die "cannot get information about the job: $?";
- my $info = XMLin($infoXml, KeyAttr => ['attrPath', 'name'])
+ my $info = XMLin($infoXml, ForceArray => 1, KeyAttr => ['attrPath', 'name'])
or die "cannot parse XML output";
- my $job = $info->{item};
- die if !defined $job || $job->{attrPath} ne $jobName;
+ my $job = $info->{item}->{$jobName};
+ die if !defined $job;
my $description = defined $job->{meta}->{description} ? $job->{meta}->{description}->{value} : "";
die unless $job->{drvPath} eq $drvPath;
my $outPath = $job->{outPath};
- buildJob($project, $jobset, $jobName, $drvPath, $outPath, $inputInfo, $job->{system});
+ buildJob($project, $jobset, $jobName, $description, $drvPath, $outPath, $inputInfo, $job->{system});
};