FBR: Stop building F28 AH image artifacts during bodhi run

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

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.

Can I get +1 for the patch (available in email attachment.)?

Thanks,
Sinny
From 213ebe7afa0afd9e9e588046fe61d36186ffb6ee Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@xxxxxxxxxx>
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 <sinny@xxxxxxxxxx>
---
 .../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 a523674e1..af3f5ea29 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 ]]',
-- 
2.17.1

_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx

[Index of Archives]     [Fedora Development]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [KDE Users]

  Powered by Linux