[PATCH] bodhi-pungi: prevent NVR conflicts for image builds

[Dusty Mabe]

Use a different version string for the updates vs updates-testing
so that NVRs don't conflict.
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index fd1e775a3..4ef0c6115 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -203,7 +203,11 @@ image_build = {
             'image-build': {
                 'format': [('qcow2', 'qcow2'), ('raw-xz',
'raw.xz')],
                 'name': 'Fedora-AtomicHost',
-                'version': '!VERSION_FROM_VERSION'
+                [% if request.name == 'stable' %]
+                    # Use a different version string for the updates vs updates-testing
+                    # runs so that NVRs don't conflict
+					'version': '!VERSION_FROM_VERSION'
+                [% endif %]
                 'release': '!RELEASE_FROM_DATE_RESPIN'
                 'kickstart': 'fedora-atomic.ks',
                 'distro': 'Fedora-22',
@@ -225,7 +229,11 @@ image_build = {
             'image-build': {
                 'format':
[('vagrant-libvirt','vagrant-libvirt.box'),
('vagrant-virtualbox','vagrant-virtualbox.box')],
                 'name': 'Fedora-AtomicHost-Vagrant',
-                'version': '!VERSION_FROM_VERSION'
+                [% if request.name == 'stable' %]
+                    # Use a different version string for the updates vs updates-testing
+                    # runs so that NVRs don't conflict
+					'version': '!VERSION_FROM_VERSION'
+                [% endif %]
                 'release': '!RELEASE_FROM_DATE_RESPIN'
                 'kickstart': 'fedora-atomic-vagrant.ks',
                 'distro': 'Fedora-22',
-- 
2.14.4

[Dusty Mabe]

On 08/15/2018 10:24 AM, Dusty Mabe wrote:
>  Use a different version string for the updates vs updates-testing
>  so that NVRs don't conflict. 
Examples where this has bit us:

https://pagure.io/dusty/failed-composes/issue/631
https://pagure.io/dusty/failed-composes/issue/578

Dusty

[Patrick マルタインアンドレアス Uiterwijk]

So, I guess that the current patch will work just fine, so +1 on that, but it does make
updates out of sync with updates-testing.
Before changing these paths, we need to ask adamw whether this will break his tooling, and
possibly coordinate with him.

[Dusty Mabe]

On 08/15/2018 02:39 PM, Patrick  マルタインアンドレアス  Uiterwijk wrote:
>  So, I guess that the current patch will work just fine, so +1 on
> that, but it does make updates out of sync with updates-testing.
>  Before changing these paths, we need to ask adamw whether this will break his tooling,
> and possibly coordinate with him. 
Talked with adamw and patrick.. I've now merged this.

Dusty