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

[Sinny Kumari <ksinny@xxxxxxxxx>]

Sorry for late response.

Last patch didn't work when we tested in koji for an image build.

We had to make some changes in pungi [1] to fix it and now fix

is available in pungi-4.1.26-2.

New patch (available in attachment) should work once bodhi-backend-01

is updated with latest pungi. [2]

[1] https://pagure.io/pungi/c/1759c1ba80156a8ec466e4ad31802930ade4ba8e?branch=master

[2] https://pagure.io/fedora-infrastructure/issue/7154

On Fri, Jun 22, 2018 at 10:11 AM, Sinny Kumari <ksinny@xxxxxxxxx> wrote:

On Thu, Jun 21, 2018 at 11:51 PM, Dusty Mabe <dusty@xxxxxxxxxxxxx> wrote:

On 06/21/2018 10:49 AM, Sinny Kumari wrote:
> 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.

Thanks Sinny!

Since we are already only building images for >= 28 then I don't think we
need the if/endif statements in your patch.

Yeah , we don't now but added it because we may need in future when F29

is released. I have updated patch (available in attachment) with removing if condition.

I would say to try to work with randy/lsedlar to test this in stage but
since nothing is yet depending on these images I'm not opposed to just
merging this and seeing if it works in prod.

Randy is on PTO currently, will check with lsedlar if he can test this patch

on stage.

 

>
> [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

--

http://sinny.io/

--

http://sinny.io/

From 424b8761d80be8cbcad5d05e1f8b3eb5c7503183 Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@xxxxxxxxxx>
Date: Wed, 18 Jul 2018 07:32:20 -0400
Subject: [PATCH] Attempt to get better AH 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
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index a401b8a3c..deec6e02e 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -201,6 +201,8 @@ image_build = {
             'image-build': {
                 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
                 'name': 'Fedora-AtomicHost',
+                'version': '!!VERSION_FROM_VERSION'
+                'release': '!RELEASE_FROM_DATE_RESPIN'
                 'kickstart': 'fedora-atomic.ks',
                 'distro': 'Fedora-22',
                 'disk_size': 6,
@@ -221,6 +223,8 @@ image_build = {
             'image-build': {
                 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
                 'name': 'Fedora-AtomicHost-Vagrant',
+                'version': '!!VERSION_FROM_VERSION'
+                'release': '!RELEASE_FROM_DATE_RESPIN'
                 'kickstart': 'fedora-atomic-vagrant.ks',
                 'distro': 'Fedora-22',
                 'disk_size': 40,
-- 
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/message/ADROZK2ZLSHIMLFKHRMJ6ZYFAZRFUE56/