robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

createiso: Skip if buildinstall fails

Browse source 
If the ISO is meant to be bootable but lorax fails, there's no point in
creating the ISO as it will not behave as expected.

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1574585
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-05-04 08:41:23 +02:00
parent 490f079c44
commit 99b6e44a30
4 changed files with 79 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/pungi-config-validate
View file

@ -95,9 +95,10 @@ def run(config, topdir, has_old):
pass
pkgset_phase = pungi.phases.PkgsetPhase(compose)
buildinstall_phase = pungi.phases.BuildinstallPhase(compose)
phases = [
pungi.phases.InitPhase(compose),
pungi.phases.BuildinstallPhase(compose),
buildinstall_phase,
pkgset_phase,
pungi.phases.GatherPhase(compose, pkgset_phase),
pungi.phases.ExtraFilesPhase(compose, pkgset_phase),
@ -105,7 +106,7 @@ def run(config, topdir, has_old):
pungi.phases.OstreeInstallerPhase(compose),
pungi.phases.OSTreePhase(compose),
pungi.phases.ProductimgPhase(compose, pkgset_phase),
pungi.phases.CreateisoPhase(compose),
pungi.phases.CreateisoPhase(compose, buildinstall_phase),
pungi.phases.LiveImagesPhase(compose),
pungi.phases.LiveMediaPhase(compose),
pungi.phases.ImageBuildPhase(compose),

2
bin/pungi-koji
View file

@ -293,7 +293,7 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
ostree_installer_phase = pungi.phases.OstreeInstallerPhase(compose)
ostree_phase = pungi.phases.OSTreePhase(compose)
productimg_phase = pungi.phases.ProductimgPhase(compose, pkgset_phase)
createiso_phase = pungi.phases.CreateisoPhase(compose)
createiso_phase = pungi.phases.CreateisoPhase(compose, buildinstall_phase)
liveimages_phase = pungi.phases.LiveImagesPhase(compose)
livemedia_phase = pungi.phases.LiveMediaPhase(compose)
image_build_phase = pungi.phases.ImageBuildPhase(compose)