[backend] scheduler: also do dodcheck for containers

openSUSE · May 27, 2021 · 28479aa · 28479aa
1 parent aa1784c
commit 28479aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/backend/BSSched/BuildJob/Docker.pm b/src/backend/BSSched/BuildJob/Docker.pm
@@ -312,6 +312,8 @@ sub check {
   if ($state eq 'scheduled') {
     my $dods = BSSched::DoD::dodcheck($ctx, $pool, $myarch, @edeps);
     return ('blocked', $dods) if $dods;
+    $dods = BSSched::DoD::dodcheck($ctx, $ctx->{'pool'}, $myarch, map {$_->{'name'}} @cbdep);
+    return ('blocked', $dods) if $dods;
   }
   return ($state, $data);
 }

diff --git a/src/backend/BSSched/BuildJob/KiwiImage.pm b/src/backend/BSSched/BuildJob/KiwiImage.pm
@@ -271,6 +271,8 @@ sub check {
   if ($state eq 'scheduled') {
     my $dods = BSSched::DoD::dodcheck($ctx, $pool, $myarch, @edeps);
     return ('blocked', $dods) if $dods;
+    $dods = BSSched::DoD::dodcheck($ctx, $ctx->{'pool'}, $myarch, $cbdep->{'name'}) if $cbdep;
+    return ('blocked', $dods) if $dods;
   }
   return ($state, $data);
 }