[PATCH] bodhi update run: Attempt to get better Atomic images media name during updates run

[Sinny Kumari <ksinny@xxxxxxxxx>]

From past few weeks, we have started producing Atomic composes

media during Fedora 28 bodhi updates and updates-testing run.

Media name of AH ISO are perfectly fine. But for cloud images 

media name[1] looks something like

Fedora-AtomicHost-28_Update-20180620.1235.x86_64.qcow2 for qcow2.

It will be nice to have media name like

Fedora-AtomicHost-28-20180620.0.x86_64.qcow2 which

is what we get during regular atomic twoweek compose run [2].

This patch (available in email attachment) attempts to fix the media name.

Taken inspiration from releng issue [3] and ansible commit [4]. I am not

sure how to test it locally, any pointers will be useful.

[1] https://kojipkgs.fedoraproject.org/compose/updates/Fedora-28-updates-20180620.0/compose/AtomicHost/x86_64/images/

[2] https://kojipkgs.fedoraproject.org/compose/twoweek/Fedora-Atomic-28-20180620.0/compose/AtomicHost/x86_64/images/

[3] https://pagure.io/releng/issue/7113

[4] https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=40c32c97f2dcaab549dba7cbb5fbd1897bd57ed8

From d7396b4f7b76140b20e6df6a13e41646d1791132 Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@xxxxxxxxxx>
Date: Thu, 21 Jun 2018 19:55:57 +0530
Subject: [PATCH] Attempt to get better Atomic images media name during update
 run

Atomic cloud images produced during updates and updates-testing
run contains name something like
Fedora-AtomicHost-28_Update-20180620.1235.x86_64.qcow2 . It
will be nice to have media name
like Fedora-AtomicHost-28-20180620.0.x86_64.qcow2 which we
get during regular atomic twoweek compose run

Signed-off-by: Sinny Kumari <sinny@xxxxxxxxxx>
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 631e07af7..16b3846c6 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -198,6 +198,9 @@ image_build = {
     '^AtomicHost$': [
         {
             'image-build': {
+                [% if release.version_int >= 28 %]
+                    'version': '!VERSION_FROM_VERSION_DATE_RESPIN',
+                [% endif %]
                 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
                 'name': 'Fedora-AtomicHost',
                 'kickstart': 'fedora-atomic.ks',
@@ -218,6 +221,9 @@ image_build = {
         },
         {
             'image-build': {
+                [% if release.version_int >= 28 %]
+                    'version': '!VERSION_FROM_VERSION_DATE_RESPIN',
+                [% endif %]
                 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
                 'name': 'Fedora-AtomicHost-Vagrant',
                 'kickstart': 'fedora-atomic-vagrant.ks',
-- 
2.14.4

_______________________________________________
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/message/O7RXTVSZIN4W4SZZQUVA7EOJDSGUKTFF/