From d5212c311e6fcd2c70550593c6ca59a845f93d7a Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 26 Oct 2017 21:36:55 +0000 Subject: [PATCH] Update ostree config Signed-off-by: Patrick Uiterwijk --- .../backend/templates/pungi.rpm.conf.j2 | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index e464f5d354..3795a010ec 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -101,30 +101,30 @@ createiso_skip = [ }), ] -[% if release.id_prefix == 'FEDORA' %] +[% if release.id_prefix == 'FEDORA' and release.version_int >= 26 %] ostree = [ ("^Everything$", { "x86_64": { - [% if release.version_int >= 27 %] + [% if release.version_int >= 28 %] "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - [% endif %] - [% if release.version_int == 25 %] - "treefile": "fedora-atomic-docker-host.json", - [% else %] - "treefile": "fedora-atomic-host.json", [% endif %] + "treefile": "fedora-atomic-host-updates-[[ request.name ]].json", "config_url": "https://pagure.io/fedora-atomic.git", "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 ]]-updates/compose/Everything/x86_64/os/" + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/fedora/linux/updates/[[ release.version ]]/x86_64/" + [% endif %] + [% if release.version_int == 27 %] + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/fedora/linux/development/[[ release.version_int ]]/Everything/x86_64/os/" + [% else %] + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/fedora/linux/releases/[[ release.version_int ]]/Everything/x86_64/os/" [% endif %] - "https://dl.fedoraproject.org/pub/fedora/linux/releases/[[ release.version_int ]]/Everything/x86_64/os/" ] - "ostree_repo": "/mnt/koji/compose/updates/atomic/[[ request.name ]]", - "tag_ref": True + "ostree_repo": "/mnt/koji/atomic/[[ release.version ]]", + "tag_ref": False } }) ]