Merge pull request #16829 from mlschroe/master

[backend] tweak automatic obsrepositories mode for DoD containers
openSUSE · Sep 10, 2024 · 1fddb2a · 1fddb2a
2 parents 8f38604 + 940608c
commit 1fddb2a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/backend/BSSched/BuildJob/Docker.pm b/src/backend/BSSched/BuildJob/Docker.pm
@@ -183,8 +183,8 @@ sub check {
     my @newpath;
     my $annotationbdep = $cbdep[-1];
     my $annotation = BSSched::BuildJob::getcontainerannotation($cpool, $annotationbdep->{'p'}, $annotationbdep);
-    if (!$annotation && !$haveobsrepositories) {
-      # no annotation, assume obsrepositories:/
+    if ((!$annotation || $annotation->{'registry_digest'}) && !$haveobsrepositories) {
+      # no annotation or DoD container, assume obsrepositories:/
       push @newpath, {'project' => '_obsrepositories', 'repository' => ''};
       $annotation = { 'repo' => [ { 'url' => 'obsrepositories:/' } ] };
       $annotationbdep->{'annotation'} = BSUtil::toxml($annotation, $BSXML::binannotation);