From ae525c269da8bb404432aa8586e0c40a3e356dcc Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Fri, 12 Oct 2018 13:15:01 +0530 Subject: [PATCH] Stop building F28 AH image artifacts during bodhi run Next Fedora Atomic Host TwoWeek release will be based on F29 stream and same will be followed in future releases. So, building F28 AH artifacts during bodhi run is not needed. Additionally, use testing refs to build image artifacts for updates-testing compose and updates refs to build updates compose during bodhi run. Related change - https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29 Signed-off-by: Sinny Kumari --- .../backend/templates/pungi.rpm.conf.j2 | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index a523674e17..af3f5ea29e 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -200,7 +200,7 @@ ostree = { } [% endif %] -[% if release.id_prefix == 'FEDORA' and release.version_int >= 28 %] +[% if release.id_prefix == 'FEDORA' and release.version_int >= 29 %] 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' @@ -225,7 +225,14 @@ image_build = { 'version': '!VERSION_FROM_VERSION' [% endif %] 'release': '!RELEASE_FROM_DATE_RESPIN' - 'kickstart': 'fedora-atomic.ks', + [% if request.name == 'stable' %] + # Use updates ref to build updates images and testing ref to build + # updates-testing images. + # https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29 + 'kickstart': 'fedora-atomic-updates.ks', + [% else %] + 'kickstart': 'fedora-atomic-testing.ks', + [% endif %] 'distro': 'Fedora-22', 'disk_size': 6, 'target': 'f[[ release.version_int ]]', @@ -251,7 +258,14 @@ image_build = { 'version': '!VERSION_FROM_VERSION' [% endif %] 'release': '!RELEASE_FROM_DATE_RESPIN' - 'kickstart': 'fedora-atomic-vagrant.ks', + [% if request.name == 'stable' %] + # Use updates ref to build updates images and testing ref to build + # updates-testing images. + # https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29 + 'kickstart': 'fedora-atomic-vagrant-updates.ks', + [% else %] + 'kickstart': 'fedora-atomic-vagrant-testing.ks', + [% endif %] 'distro': 'Fedora-22', 'disk_size': 40, 'target': 'f[[ release.version_int ]]',