From a04c117eb6fe600d881e3fbc753796388515c2c3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Nov 2013 18:30:36 +0100 Subject: [PATCH] Revert "Remove wacky "sysbuild" filtering" This reverts commit 2d7e106d293c7e81b4b0b333d256aef0490ea1bc. Unfortunately some jobsets still depend on this behaviour. They could probably do something like "assert system == input.system; ..." but changing them all is undesirable. --- src/lib/Hydra/Helper/AddBuilds.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm index 99f1b85e..a7e5c9c8 100644 --- a/src/lib/Hydra/Helper/AddBuilds.pm +++ b/src/lib/Hydra/Helper/AddBuilds.pm @@ -286,6 +286,17 @@ sub evalJobs { SuppressEmpty => '') or die "cannot parse XML output"; + my @filteredJobs = (); + foreach my $job (@{$jobs->{job}}) { + my $validJob = 1; + foreach my $arg (@{$job->{arg}}) { + my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}]; + $validJob = 0 if $input->{type} eq "sysbuild" && $input->{system} ne $job->{system}; + } + push(@filteredJobs, $job) if $validJob; + } + $jobs->{job} = \@filteredJobs; + my %jobNames; my $errors; foreach my $job (@{$jobs->{job}}) {