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

bodhi-pungi: don't use for loop for arch, use $arch

Browse source 
It turns out we don't need a for loop for this, we just needed to
use $arch instead of $basearch in the URL. Also, the for loop doesn't
work because of koji unique NVR enforcement on image builds.
This commit is contained in:
Dusty Mabe 2018-04-20 12:11:25 -04:00
parent 01d70107fc
commit d082e5e8a9
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,22 +195,20 @@ volume_id_substitutions = {
# Other ostree artifacts
image_build = {
'^AtomicHost$': [
[% for arch in ['x86_64', 'aarch64', 'ppc64le'] %]
{
'image-build': {
'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
'name': 'Fedora-Atomic',
'kickstart': 'fedora-atomic.ks',
'distro': 'Fedora-22',
'disk_size': 6,
'target': 'f[[ release.version_int ]]',
'arches': ['[[arch]]'],
'install_tree_from': "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/"
'subvariant': 'AtomicHost',
'failable': ['*'],
}
},
[% endfor %]
{
'image-build': {
'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
'name': 'Fedora-Atomic',
'kickstart': 'fedora-atomic.ks',
'distro': 'Fedora-22',
'disk_size': 6,
'target': 'f[[ release.version_int ]]',
'arches': ['x86_64', 'aarch64', 'ppc64le'],
'install_tree_from': "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/"
'subvariant': 'AtomicHost',
'failable': ['*'],
}
}
]
}