From 07aaec7566c41a515a967edd664ecf92583bc1d3 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 12 Apr 2018 16:49:05 -0400 Subject: [PATCH] bodhi-pungi: some fixups for recent addition of Atomic Host Some fixups and also make them failable. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 401d1d5349..8cb2172cda 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -185,8 +185,16 @@ ostree = { [% endif %] [% if release.id_prefix == 'FEDORA' and release.version_int >= 28 %] -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27' +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f[[ release.version_int ]]' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' +image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' +image_volid_formats = [ + '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' + ] +volume_id_substitutions = { + 'AtomicHost': 'AH', + 'Everything': 'E', +} # Other ostree artifacts image_build = { @@ -195,12 +203,13 @@ image_build = { 'image-build': { 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')], 'name': 'Fedora-Atomic', - 'kickstart': 'fedora-kickstart.ks', + 'kickstart': 'fedora-atomic.ks', 'distro': 'Fedora-22', 'disk_size': 6, 'arches': ['x86_64', 'aarch64', 'ppc64le'], 'install_tree_from': "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" 'subvariant': 'AtomicHost', + 'failable': ['*'], } } ] @@ -236,6 +245,7 @@ ostree_installer = { ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'f[[ release.version_int ]]' + 'failable': ['*'], }, [% endfor %] })