From 61fc61dcd8878e3a0ba4d5733991a9abc61cde22 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 20 Apr 2018 12:13:04 -0400 Subject: [PATCH] bodhi-pugni: ostree installer, subs arch into repo urls 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 7c611340c9..d92ad4f160 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{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", + "https://kojipkgs{{ 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{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" [% endif %] ], 'release': None,