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

bodhi-pungi: fix image-build urls for install_tree_from

Browse source 
Since $basearch won't work in the url we need to manually
substitute arch. Make a for loop and specify a unique url
for each arch.
This commit is contained in:
Dusty Mabe 2018-04-18 14:18:34 -04:00
parent 9bd9110781
commit feb33826b3
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,6 +196,7 @@ volume_id_substitutions = {
image_build = { image_build = {
'^Everything$': [ '^Everything$': [
{ {
[% for arch in ['x86_64', 'aarch64', 'ppc64le'] %]
'image-build': { 'image-build': {
'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')], 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
'name': 'Fedora-Atomic', 'name': 'Fedora-Atomic',
@ -203,11 +204,12 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 6, 'disk_size': 6,
'target': 'f[[ release.version_int ]]', 'target': 'f[[ release.version_int ]]',
'arches': ['x86_64', 'aarch64', 'ppc64le'], 'arches': ['[[arch]]'],
'install_tree_from': "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" 'install_tree_from': "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/"
'subvariant': 'AtomicHost', 'subvariant': 'AtomicHost',
'failable': ['*'], 'failable': ['*'],
} },
[% endfor %]
} }
] ]
} }