[PATCH 1/2] bodhi-pungi: don't use for loop for arch, use $arch

[Dusty Mabe <dusty@xxxxxxxxxxxxx>]

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.
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 30 +++++++++++-------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index ea4fe8476..7c611340c 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -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': ['*'],
+            }
+        }
     ]
 }
 
-- 
2.14.3
_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx