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
_______________________________________________
infrastructure mailing list -- [email protected]
To unsubscribe send an email to [email protected]
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/[email protected]/message/MXEVNGFJHMJDXYCBMSCOSNJXB2MWVGFE/
