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

buildinstall: Use metadata if skipped

Browse Source 
If the phase is skipped, it could mean that we are doing a debug run and
we don't want to mess up the .treefile by missing arch specific images.
The other alternative is that the phase was really skipped, in which
case there will be no files generated and we already handle that fine.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-04-23 08:18:39 +02:00
parent 9915c7d644
commit ea0964eeef
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pungi/phases/buildinstall.py
View File

@ -182,7 +182,11 @@ class BuildinstallPhase(PhaseBase):
self.pool.start() self.pool.start()
def succeeded(self, variant, arch): def succeeded(self, variant, arch):
return (variant.uid if self.used_lorax else None, arch) in self.pool.finished_tasks # If the phase is skipped, we can treat it as successful. Either there
# will be no output, or it's a debug run of compose where anything can
# happen.
return (super(BuildinstallPhase, self).skip()
or (variant.uid if self.used_lorax else None, arch) in self.pool.finished_tasks)
def copy_files(self): def copy_files(self):
disc_type = self.compose.conf['disc_types'].get('dvd', 'dvd') disc_type = self.compose.conf['disc_types'].get('dvd', 'dvd')

2
tests/test_buildinstall.py
View File

@ -31,6 +31,8 @@ class BuildInstallCompose(DummyCompose):
} }
self.all_variants = self.variants.copy() self.all_variants = self.variants.copy()
self.has_comps = True self.has_comps = True
self.just_phases = []
self.skip_phases = []
class TestBuildinstallPhase(PungiTestCase): class TestBuildinstallPhase(PungiTestCase):