Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi-pungi: prevent NVR conflicts for image builds

Browse source 
Use a different version string for the updates vs updates-testing
so that NVRs don't conflict.
This commit is contained in:
Dusty Mabe 2018-08-15 10:21:57 -04:00
parent ea635849cb
commit 4f50c4d410
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
View file

@ -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',