On Thu, Jun 21, 2018 at 11:51 PM, Dusty Mabe <du...@dustymabe.com> 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/
From e69edba3a3c8da48b3102440a462c57e9919dbce Mon Sep 17 00:00:00 2001
From: Sinny Kumari <si...@redhat.com>
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 <si...@redhat.com>
---
roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 631e07af7..eec0a1615 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -198,6 +198,7 @@ image_build = {
'^AtomicHost$': [
{
'image-build': {
+ 'version': '!VERSION_FROM_VERSION_DATE_RESPIN',
'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
'name': 'Fedora-AtomicHost',
'kickstart': 'fedora-atomic.ks',
@@ -218,6 +219,7 @@ image_build = {
},
{
'image-build': {
+ 'version': '!VERSION_FROM_VERSION_DATE_RESPIN',
'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@lists.fedoraproject.org
To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org
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@lists.fedoraproject.org/message/A2ABHNJW7GIL4QNHPO2A2DFJPBU2CB6J/
