almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

osbuild: Fix not failing on failable tasks 

The task can only fail as a whole, thus it only makes sense to set all
architectures (`*`) as failable. The correct value needs to be checked
though.

JIRA: RHELCMP-3412
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2020-12-02 09:11:08 +01:00
parent 4a048d4a85
commit 98ddc74c16
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi/phases/osbuild.py
View File

@ -96,12 +96,7 @@ class RunOSBuildThread(WorkerThread):
self.can_fail = can_fail self.can_fail = can_fail
self.num = num self.num = num
with util.failable( with util.failable(
compose, compose, can_fail, variant, "*", "osbuild", logger=self.pool._logger,
bool(config.get("failable")),
variant,
"*",
"osbuild",
logger=self.pool._logger,
): ):
self.worker( self.worker(
compose, variant, config, arches, version, release, target, repo compose, variant, config, arches, version, release, target, repo

4
tests/test_osbuild_phase.py
View File

@ -381,7 +381,7 @@ class RunOSBuildThreadTest(helpers.PungiTestCase):
None, None,
"image-target", "image-target",
[self.topdir + "/compose/Everything/$arch/os"], [self.topdir + "/compose/Everything/$arch/os"],
["x86_64"], False,
), ),
1, 1,
) )
@ -408,7 +408,7 @@ class RunOSBuildThreadTest(helpers.PungiTestCase):
None, None,
"image-target", "image-target",
[self.topdir + "/compose/Everything/$arch/os"], [self.topdir + "/compose/Everything/$arch/os"],
["x86_64"], True,
), ),
1, 1,
) )