On 03/09/2018 04:25 PM, Patrick マルタインアンドレアス Uiterwijk wrote: >> 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. >> > > This is actually an f28 repo, but I had made a mistake moving things around (I accidentally moved things out of the os/ directory in the empty-repo, while this was supposed to have happened in the /pub repo), so let's keep that. > Also, for the compose/[[ release.version_int ]]/latest-Fedora, I think we should just create a symlink of /28 to /branched perhaps, but that'd be the only part we should have in this patch. > > >> + [% if release.version_int >= 28 %] > > Let's use an explicit release.version_int == 28, to indicate that this is only the case for now while we are in branched state. ok I'm using a pull request for this: https://gitlab.com/dustymabe/fedora-infra-ansible/merge_requests/1/diffs?w=1 here is the updated patch if you want to fight with pulling it in from email: >From 088ec129cd028b4c70e5a719280bfb3d7d1d2b48 Mon Sep 17 00:00:00 2001 From: Dusty Mabe <dusty@xxxxxxxxxxxxx> Date: Fri, 9 Mar 2018 14:59:13 -0500 Subject: [PATCH] bodhi pungi ostree: point to different repos for f28 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 <dusty@xxxxxxxxxxxxx> --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 42e3f6206..ff31d400e 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -127,7 +127,12 @@ ostree = { # 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/" + # 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/" + [% else %] + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + [% endif %] ] "ostree_repo": "/mnt/koji/compose/atomic/repo", "tag_ref": False, @@ -155,7 +160,12 @@ ostree = { # 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/" + # 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/" + [% else %] + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + [% endif %] ] "ostree_repo": "/mnt/koji/compose/atomic/repo", "tag_ref": False, -- 2.14.3 _______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
