The f28 repos we need to tap into are not in the same locations
as for post release (f26/f27) runs. We also don't need to include
the 'updates' repo because there is no updates repo for f28 yet.
Signed-off-by: Dusty Mabe <du...@dustymabe.com>
---
roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 28 +++++++++++++++++-------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 42e3f6206..ec0b36c9c 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -123,11 +123,17 @@ ostree = {
"config_branch": "f[[ release.version ]]",
"repo": [
"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/",
+ # If f28 then don't yet point to updates repo for testing
composes
+ # Also 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/"
+ [% else %]
+ [% 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/",
+ [% endif %]
+ "https://kojipkgs{{ env_suffix
}}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[
release.version_int ]]/compose/Everything/$basearch/os/"
[% endif %]
- "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[
release.version_int ]]/latest-Fedora-[[ release.version_int
]]/compose/Everything/$basearch/os/"
]
"ostree_repo": "/mnt/koji/compose/atomic/repo",
"tag_ref": False,
@@ -151,11 +157,17 @@ ostree = {
"config_branch": "f[[ release.version ]]",
"repo": [
"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/",
+ # If f28 then don't yet point to updates repo for testing
composes
+ # Also 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/"
+ [% else %]
+ [% 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/",
+ [% endif %]
+ "https://kojipkgs{{ env_suffix
}}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[
release.version_int ]]/compose/Everything/$basearch/os/"
[% endif %]
- "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[
release.version_int ]]/latest-Fedora-[[ release.version_int
]]/compose/Everything/$basearch/os/"
]
"ostree_repo": "/mnt/koji/compose/atomic/repo",
"tag_ref": False,
--
2.14.3
_______________________________________________
infrastructure mailing list -- infrastructure@lists.fedoraproject.org
To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org
