| Status: |
@@ -84,6 +87,8 @@
|
[% IF input.type == "build" %]
Job [% input.build.project %]:[% input.build.attrname %] build [% input.inputid %]
+ [% ELSIF input.type == "string" %]
+ "[% input.value %]"
[% ELSE %]
[% input.uri %]
[% END %]
@@ -131,13 +136,14 @@
- | Build | Input name | Timestamp |
|---|
+ | Build | Input name | System | Timestamp |
|---|
[% FOREACH input IN build.dependentBuildInputs -%]
| Job [% input.buildid.project %]:[% input.buildid.attrname %] build [% input.buildid.id %] |
[% input.name %] |
+ [% input.buildid.system %] |
[% date.format(input.buildid.timestamp, '%Y-%m-%d %H:%M:%S') %] |
[% END -%]
diff --git a/src/HydraFrontend/root/index.tt b/src/HydraFrontend/root/index.tt
index 3a545e8b..39f028e0 100644
--- a/src/HydraFrontend/root/index.tt
+++ b/src/HydraFrontend/root/index.tt
@@ -6,7 +6,7 @@
- | # | Project | Job | Timestamp | Description |
|---|
+ | # | Project | Job | System | Timestamp | Description |
|---|
[% FOREACH build IN latestBuilds -%]
@@ -21,7 +21,7 @@
- | # | Project | Job | Timestamp | Description |
|---|
+ | # | Project | Job | System | Timestamp | Description |
|---|
[% FOREACH build IN allBuilds -%]
diff --git a/src/HydraFrontend/root/job.tt b/src/HydraFrontend/root/job.tt
index 9547401d..c0df71d4 100644
--- a/src/HydraFrontend/root/job.tt
+++ b/src/HydraFrontend/root/job.tt
@@ -3,7 +3,7 @@
All builds for job [% jobName %]
- | Id | Project | Job | Timestamp | Description |
|---|
+ | Id | Project | Job | System | Timestamp | Description |
|---|
[% FOREACH build IN builds -%]
[% INCLUDE "short-build-info.tt" %]
[% END -%]
diff --git a/src/HydraFrontend/root/short-build-info.tt b/src/HydraFrontend/root/short-build-info.tt
index 74b73c65..bf6cd8af 100644
--- a/src/HydraFrontend/root/short-build-info.tt
+++ b/src/HydraFrontend/root/short-build-info.tt
@@ -11,6 +11,7 @@
[% build.id %] |
[% build.project %] |
[% build.jobset %]:[% 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 d90fe769..00743e8f 100644
--- a/src/hydra.sql
+++ b/src/hydra.sql
@@ -17,7 +17,8 @@ create table builds (
buildStatus integer, -- 0 = succeeded, 1 = Nix build failure, 2 = positive build failure
errorMsg text, -- error message in case of a Nix failure
startTime integer, -- in Unix time, 0 = used cached build result
- stopTime integer
+ stopTime integer,
+ system text not null
);
@@ -30,9 +31,10 @@ create table buildInputs (
uri text,
revision integer,
tag text,
+ value text,
inputId integer, -- build ID of the input, for type == 'build'
- path text not null,
+ path text,
primary key (buildId, name),
foreign key (buildId) references builds(id) on delete cascade -- ignored by sqlite
@@ -92,12 +94,26 @@ create table jobSets (
create table jobSetInputs (
project text not null,
- job text not null,
+ jobset text not null,
name text not null,
- type text not null, -- "svn", "cvs", "path", "file"
- uri text,
- revision integer, -- for svn
- tag text, -- for cvs
- primary key (project, job, name),
- foreign key (project, job) references jobSets(project, name) on delete cascade -- ignored by sqlite
+ 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
+);
+
+
+create table jobSetInputAlts (
+ project text not null,
+ jobset text not null,
+ input text not null,
+ altnr integer,
+
+ -- urgh
+ uri text,
+ revision integer, -- for type == 'svn'
+ tag text, -- for type == 'cvs'
+ 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
);
diff --git a/src/scheduler.pl b/src/scheduler.pl
index da8843ff..a522f8af 100644
--- a/src/scheduler.pl
+++ b/src/scheduler.pl
@@ -16,7 +16,7 @@ sub isValidPath {
sub buildJob {
- my ($project, $jobset, $jobName, $drvPath, $outPath, $usedInputs) = @_;
+ my ($project, $jobset, $jobName, $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";
@@ -54,30 +54,23 @@ sub buildJob {
, buildstatus => $buildStatus
, starttime => $startTime
, stoptime => $stopTime
+ , system => $system
});
print " build ID = ", $build->id, "\n";
foreach my $inputName (keys %{$usedInputs}) {
my $input = $usedInputs->{$inputName};
- if (defined $input->{orig}) {
- $db->resultset('Buildinputs')->create(
- { buildid => $build->id
- , name => $inputName
- , type => $input->{orig}->type
- , uri => $input->{orig}->uri
- , revision => $input->{orig}->revision
- , tag => $input->{orig}->tag
- , path => $input->{storePath}
- });
- } else {
- $db->resultset('Buildinputs')->create(
- { buildid => $build->id
- , name => $inputName
- , type => "build"
- , inputid => $input->{id}
- , path => $input->{storePath}
- });
- }
+ $db->resultset('Buildinputs')->create(
+ { buildid => $build->id
+ , name => $inputName
+ , type => $input->{type}
+ , uri => $input->{uri}
+ #, revision => $input->{orig}->revision
+ #, tag => $input->{orig}->tag
+ , value => $input->{value}
+ , inputid => $input->{id}
+ , path => ($input->{storePath} or "") # !!! temporary hack
+ });
}
my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath;
@@ -119,34 +112,32 @@ sub buildJob {
sub fetchInput {
- my ($input, $inputInfo) = @_;
+ my ($input, $alt, $inputInfo) = @_;
my $type = $input->type;
- my $uri = $input->uri;
if ($type eq "path") {
+ my $uri = $alt->uri;
my $storePath = `nix-store --add "$uri"`
or die "cannot copy path $uri to the Nix store";
chomp $storePath;
print " copied to $storePath\n";
- $$inputInfo{$input->name} = {orig => $input, storePath => $storePath};
+ $$inputInfo{$input->name} = {type => $type, uri => $uri, storePath => $storePath};
}
+ elsif ($type eq "string") {
+ die unless defined $alt->value;
+ $$inputInfo{$input->name} = {type => $type, value => $alt->value};
+ }
+
else {
die "input `" . $input->type . "' has unknown type `$type'";
}
}
-sub checkJobSet {
- my ($project, $jobset) = @_;
-
- my $inputInfo = {};
-
- foreach my $input ($jobset->jobsetinputs) {
- print " INPUT ", $input->name, " (", $input->type, " ", $input->uri, ")\n";
- fetchInput($input, $inputInfo);
- }
-
+sub checkJobSetInstance {
+ my ($project, $jobset, $inputInfo) = @_;
+
die unless defined $inputInfo->{$jobset->nixexprinput};
my $nixExprPath = $inputInfo->{$jobset->nixexprinput}->{storePath} . "/" . $jobset->nixexprpath;
@@ -183,43 +174,50 @@ sub checkJobSet {
foreach my $argName (keys(%{$jobExpr->{function}->{attrspat}->{attr}})) {
print " needs input $argName\n";
- my $storePath;
-
if (defined $inputInfo->{$argName}) {
# The argument name matches an input.
- $storePath = $inputInfo->{$argName}->{storePath};
$$usedInputs{$argName} = $inputInfo->{$argName};
+ if (defined $inputInfo->{$argName}->{storePath}) {
+ # !!! escaping
+ $extraArgs .= " --arg $argName '{path = builtins.toPath " . $inputInfo->{$argName}->{storePath} . ";}'";
+ } elsif (defined $inputInfo->{$argName}->{value}) {
+ $extraArgs .= " --argstr $argName '" . $inputInfo->{$argName}->{value} . "'";
+ }
}
else {
(my $prevBuild) = $db->resultset('Builds')->search(
{project => $project->name, jobset => $jobset->name, attrname => $argName, buildStatus => 0},
{order_by => "timestamp DESC", rows => 1});
+
+ my $storePath;
- if (defined $prevBuild) {
- # The argument name matches a previously built
- # job in this jobset. Pick the most recent
- # build. !!! refine the selection criteria:
- # e.g., most recent successful build.
- if (!isValidPath($prevBuild->outpath)) {
- die "input path " . $prevBuild->outpath . " has been garbage-collected";
- }
- $storePath = $prevBuild->outpath;
- } else {
+ if (!defined $prevBuild) {
# !!! reschedule?
die "missing input `$argName'";
}
+
+ # The argument name matches a previously built
+ # job in this jobset. Pick the most recent
+ # build. !!! refine the selection criteria:
+ # e.g., most recent successful build.
+ if (!isValidPath($prevBuild->outpath)) {
+ die "input path " . $prevBuild->outpath . " has been garbage-collected";
+ }
+
$$usedInputs{$argName} =
- { storePath => $storePath
+ { type => "build"
+ , storePath => $prevBuild->outpath
, id => $prevBuild->id
};
+
+ $extraArgs .= " --arg $argName '{path = builtins.toPath " . $prevBuild->outpath . ";}'";
}
-
- $extraArgs .= " --arg $argName '{path = " . $storePath . ";}'";
}
}
# Instantiate the store derivation.
+ print $extraArgs, "\n";
my $drvPath = `nix-instantiate $nixExprPath --attr $jobName $extraArgs`
or die "cannot evaluate the Nix expression containing the job definitions: $?";
chomp $drvPath;
@@ -232,14 +230,40 @@ sub checkJobSet {
or die "cannot parse XML output";
my $job = $info->{item};
- die unless !defined $job || $job->{system} ne $jobName;
+ die if !defined $job || $job->{attrPath} ne $jobName;
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, $usedInputs);
+ buildJob($project, $jobset, $jobName, $drvPath, $outPath, $usedInputs, $job->{system});
}
+};
+
+
+sub checkJobSetAlts {
+ my ($project, $jobset, $inputs, $n, $inputInfo) = @_;
+
+ if ($n >= scalar @{$inputs}) {
+ checkJobSetInstance($project, $jobset, $inputInfo);
+ return;
+ }
+
+ my $input = @{$inputs}[$n];
+
+ foreach my $alt ($input->jobsetinputalts) {
+ print " INPUT ", $input->name, " (type ", $input->type, ") alt ", $alt->altnr, "\n";
+ fetchInput($input, $alt, $inputInfo); # !!! caching
+ checkJobSetAlts($project, $jobset, $inputs, $n + 1, $inputInfo);
+ }
+};
+
+
+sub checkJobSet {
+ my ($project, $jobset) = @_;
+ my $inputInfo = {};
+ my @jobsetinputs = $jobset->jobsetinputs;
+ checkJobSetAlts($project, $jobset, \@jobsetinputs, 0, $inputInfo);
}
diff --git a/src/test.sql b/src/test.sql
index 5633e7a9..d1e91236 100644
--- a/src/test.sql
+++ b/src/test.sql
@@ -1,8 +1,14 @@
insert into projects(name) values('patchelf');
insert into jobSets(project, name, description, nixExprInput, nixExprPath) values('patchelf', 'trunk', 'PatchELF', 'patchelfSrc', 'release.nix');
-insert into jobSetInputs(project, job, name, type, uri) values('patchelf', 'trunk', 'patchelfSrc', 'path', '/home/eelco/Dev/patchelf-wc');
-insert into jobSetInputs(project, job, name, type, uri) values('patchelf', 'trunk', 'nixpkgs', 'path', '/home/eelco/Dev/nixpkgs-wc');
-insert into jobSetInputs(project, job, name, type, uri) values('patchelf', 'trunk', 'release', 'path', '/home/eelco/Dev/release');
+insert into jobSetInputs(project, jobset, name, type) values('patchelf', 'trunk', 'patchelfSrc', 'path');
+insert into jobSetInputAlts(project, jobset, input, altnr, uri) 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, uri) 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, uri) 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');
--insert into projects(name) values('nixpkgs');
--insert into jobSets(project, name) values('nixpkgs', 'trunk');
|