From aa7cc6d599e0a4750885833175d3b4b396026b5e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 Apr 2016 14:35:57 -0400 Subject: [PATCH] Declarative projects: Include the fetch info for the declarative input in the project eval --- src/script/hydra-evaluator | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/script/hydra-evaluator b/src/script/hydra-evaluator index 1a77c7d1..840f2d56 100755 --- a/src/script/hydra-evaluator +++ b/src/script/hydra-evaluator @@ -103,6 +103,7 @@ sub checkJobsetWrapped { my ($jobset) = @_; my $project = $jobset->project; my $jobsetsJobset = length($project->declfile) && $jobset->name eq ".jobsets"; + my $inputInfo = {}; if ($jobsetsJobset) { my @declInputs = fetchInput($plugins, $db, $project, $jobset, "decl", $project->decltype, $project->declvalue, 0); my $declInput = @declInputs[0] or die "cannot find the input containing the declarative project specification\n"; @@ -118,8 +119,8 @@ sub checkJobsetWrapped { die "Declarative specification file $declFile not valid JSON: $@\n" if $@; updateDeclarativeJobset($db, $project, ".jobsets", $declSpec); $jobset->discard_changes; + $inputInfo->{"declInput"} = [ $declInput ]; } - my $inputInfo = {}; my $exprType = $jobset->nixexprpath =~ /.scm$/ ? "guile" : "nix"; # Fetch all values for all inputs.