janik/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

* Record the input containing the Nix expression (release.nix) in the

Browse source 
build inputs.  Otherwise we can't (for example) reproduce a build
  later.
This commit is contained in:
Eelco Dolstra 2009-03-23 21:42:59 +00:00
parent dab25b30f0
commit c75977ce5a
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/script/hydra_scheduler.pl
View file

@ -250,7 +250,7 @@ sub fetchInputs {
sub checkJob { sub checkJob {
my ($project, $jobset, $inputInfo, $job) = @_; my ($project, $jobset, $inputInfo, $nixExprInput, $job) = @_;
my $jobName = $job->{jobName}; my $jobName = $job->{jobName};
my $drvPath = $job->{drvPath}; my $drvPath = $job->{drvPath};
@ -299,16 +299,23 @@ sub checkJob {
, locker => "" , locker => ""
}); });
my %inputs;
$inputs{$jobset->nixexprinput} = $nixExprInput;
foreach my $arg (@{$job->{arg}}) { foreach my $arg (@{$job->{arg}}) {
my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}] or die "invalid input"; $inputs{$arg->{name}} = $inputInfo->{$arg->{name}}->[$arg->{altnr}]
|| die "invalid input";
}
foreach my $name (keys %inputs) {
my $input = $inputs{$name};
$build->buildinputs_builds->create( $build->buildinputs_builds->create(
{ name => $arg->{name} { name => $name
, type => $input->{type} , type => $input->{type}
, uri => $input->{uri} , uri => $input->{uri}
, revision => $input->{revision} , revision => $input->{revision}
, value => $input->{value} , value => $input->{value}
, dependency => $input->{id} , dependency => $input->{id}
, path => ($input->{storePath} or "") # !!! temporary hack , path => $input->{storePath} || "" # !!! temporary hack
, sha256hash => $input->{sha256hash} , sha256hash => $input->{sha256hash}
}); });
} }
@ -363,9 +370,10 @@ sub checkJobset {
fetchInputs($project, $jobset, $inputInfo); fetchInputs($project, $jobset, $inputInfo);
# Evaluate the job expression. # Evaluate the job expression.
my $nixExprPath = $inputInfo->{$jobset->nixexprinput}->[0]->{storePath} die "not supported" if scalar @{$inputInfo->{$jobset->nixexprinput}} != 1;
my $nixExprInput = $inputInfo->{$jobset->nixexprinput}->[0]
or die "cannot find the input containing the job expression"; or die "cannot find the input containing the job expression";
$nixExprPath .= "/" . $jobset->nixexprpath; my $nixExprPath = $nixExprInput->{storePath} . "/" . $jobset->nixexprpath;
(my $res, my $jobsXml, my $stderr) = captureStdoutStderr( (my $res, my $jobsXml, my $stderr) = captureStdoutStderr(
"hydra_eval_jobs", $nixExprPath, "--gc-roots-dir", getGCRootsDir, "hydra_eval_jobs", $nixExprPath, "--gc-roots-dir", getGCRootsDir,
@ -384,7 +392,7 @@ sub checkJobset {
foreach my $job (@{$jobs->{job}}) { foreach my $job (@{$jobs->{job}}) {
next if $job->{jobName} eq ""; next if $job->{jobName} eq "";
print "considering job " . $job->{jobName} . "\n"; print "considering job " . $job->{jobName} . "\n";
checkJob($project, $jobset, $inputInfo, $job); checkJob($project, $jobset, $inputInfo, $nixExprInput, $job);
} }
# Mark all existing jobs that we haven't seen as inactive. # Mark all existing jobs that we haven't seen as inactive.