The git commit messages help explain this. It turns out the $basearch issue we had a few days ago [1] could have just been fixed by using $arch instead.
Dusty
[1] https://pagure.io/dusty/failed-composes/issue/176#comment-506967
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%7B%7B 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%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/" + 'subvariant': 'AtomicHost', + 'failable': ['*'], + } + } ] }
Since we are using a for loop for ostree_installer let's go ahead and substitute [[arch]] in the urls there. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 7c611340c..d92ad4f16 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -220,13 +220,13 @@ ostree_installer = [ "Everything", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates - "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", + "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/", [% endif %] # For f28 the compose location is under /compose/branched/ [% if release.version_int == 28 %] - "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" [% else %] - "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" [% endif %] ], 'release': None,
On 04/20/2018 12:16 PM, Dusty Mabe wrote:
The git commit messages help explain this. It turns out the $basearch issue we had a few days ago [1] could have just been fixed by using $arch instead.
Dusty
[1] https://pagure.io/dusty/failed-composes/issue/176#comment-506967
Also see: https://pagure.io/dusty/failed-composes/issue/181#comment-507421
On 04/20/2018 09:16 AM, Dusty Mabe wrote:
The git commit messages help explain this. It turns out the $basearch issue we had a few days ago [1] could have just been fixed by using $arch instead.
Dusty
[1] https://pagure.io/dusty/failed-composes/issue/176#comment-506967 _______________________________________________ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org
ok. +1 to another try.
kevin
On 04/20/2018 01:14 PM, Kevin Fenzi wrote:
On 04/20/2018 09:16 AM, Dusty Mabe wrote:
The git commit messages help explain this. It turns out the $basearch issue we had a few days ago [1] could have just been fixed by using $arch instead.
Dusty
[1] https://pagure.io/dusty/failed-composes/issue/176#comment-506967 _______________________________________________ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org
ok. +1 to another try.
pushed! thanks
infrastructure@lists.fedoraproject.org