forked from lix-project/hydra
Merge pull request #815 from helsinki-systems/fix/non-static-decl
Fix non-static declarative jobsets
This commit is contained in:
commit
b8a4ed0c77
|
@ -573,7 +573,14 @@ sub checkJobsetWrapped {
|
||||||
die "Declarative specification file $declFile not valid JSON: $@\n" if $@;
|
die "Declarative specification file $declFile not valid JSON: $@\n" if $@;
|
||||||
|
|
||||||
if (ref $declSpec eq "HASH") {
|
if (ref $declSpec eq "HASH") {
|
||||||
if (grep ref $_ eq "HASH", values %$declSpec) {
|
my $isStatic = 1;
|
||||||
|
foreach my $elem (values %$declSpec) {
|
||||||
|
if (ref $elem ne "HASH") {
|
||||||
|
$isStatic = 0;
|
||||||
|
last;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($isStatic) {
|
||||||
# Since all of its keys are hashes, assume the json document
|
# Since all of its keys are hashes, assume the json document
|
||||||
# itself is the entire set of jobs
|
# itself is the entire set of jobs
|
||||||
handleDeclarativeJobsetJson($db, $project, $declSpec);
|
handleDeclarativeJobsetJson($db, $project, $declSpec);
|
||||||
|
|
Loading…
Reference in a new issue