diff --git a/fedora.conf b/fedora.conf index 69a5f83..7005812 100644 --- a/fedora.conf +++ b/fedora.conf @@ -463,7 +463,7 @@ live_media = { failable_deliverables = [ ('^.*$', { # Buildinstall can fail on any variant and any arch - '*': ['buildinstall', 'image-build', 'live-media', 'live', 'ostree', 'ostree_installer'], + '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree_installer'], 'src': ['buildinstall'], # Nothing on i386 blocks the compose 'i386': ['buildinstall', 'iso', 'live'], @@ -569,27 +569,27 @@ ostree = [ }) ] -ostree_installer = [ - ("^Atomic$", { - "x86_64": { - "source_repo_from": "Everything", - "release": None, - "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso", - "installpkgs": ["fedora-productimg-atomic"], - "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"], - "add_template_var": [ - "ostree_osname=fedora-atomic", - "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host", - ], - "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"], - "add_arch_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", - "ostree_osname=fedora-atomic", - "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host", - ] - } - }) -] +#ostree_installer = [ +# ("^Atomic$", { +# "x86_64": { +# "source_repo_from": "Everything", +# "release": None, +# "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso", +# "installpkgs": ["fedora-productimg-atomic"], +# "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"], +# "add_template_var": [ +# "ostree_osname=fedora-atomic", +# "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host", +# ], +# "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"], +# "add_arch_template_var": [ +# "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", +# "ostree_osname=fedora-atomic", +# "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host", +# ] +# } +# }) +#] release_id_allow_missing = True koji_profile = 'koji'