From fa9c735e3d9cb694ac5deadbf61371daaba08920 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 1 Jun 2018 09:32:10 -0400
Subject: [PATCH] bodhi-pungi: convert image-build to use non branched

Need to move it to use non-branched location for f28.
Added the if/else for future when we start using branched
f29.
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 1b02fd2df0..26846fc3bd 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -205,7 +205,13 @@ image_build = {
                 '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/"
+                'install_tree_from': 
+                    # For f29 the compose location is under /compose/branched/
+                    [% if release.version_int == 29 %]
+                        "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/$arch/os/",
+                    [% endif %]
                 'subvariant': 'AtomicHost',
                 'failable': ['*'],
             }