From 6ffa97bce83074e7ba1cba9d0d70ccbc92ac2318 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 8 Mar 2018 10:53:20 +0100 Subject: [PATCH] Update Bodhi configuration for modularity changes Signed-off-by: Patrick Uiterwijk --- roles/bodhi2/backend/templates/variants.module.xml.j2 | 4 ++-- roles/bodhi2/base/templates/production.ini.j2 | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/roles/bodhi2/backend/templates/variants.module.xml.j2 b/roles/bodhi2/backend/templates/variants.module.xml.j2 index cb1de76d03..337c33adae 100644 --- a/roles/bodhi2/backend/templates/variants.module.xml.j2 +++ b/roles/bodhi2/backend/templates/variants.module.xml.j2 @@ -12,8 +12,8 @@ x86_64 - [% for module in modules %] - [[ module ]] + [% for module in moduledefs %] + [[ module.name ]]:[[ module.stream ]]:[[ module.version ]] [% endfor %] diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 90eb91e224..a49cfb3067 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -193,6 +193,7 @@ pungi.extracmdline = --notification-script=/usr/bin/pungi-fedmsg-notification -- {% if env == 'production' %} master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/%s/repodata/repomd.xml fedora_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/%s/repodata/repomd.xml +fedora_28_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/Everything/%s/repodata/repomd.xml fedora_epel_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml {% endif %} @@ -211,8 +212,8 @@ fedora_epel_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s {% if env == 'production' %} fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%s/%s/repodata/repomd.xml -fedora_modular_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/modular/updates/%s/Server/%s/repodata/repomd.xml -fedora_modular_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/modular/updates/testing/%s/Server/%s/repodata/repomd.xml +fedora_modular_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/Modular/%s/repodata/repomd.xml +fedora_modular_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/Modular/%s/repodata/repomd.xml {% elif env == 'staging' %} fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-updates/compose/Everything/%s/os/repodata/repomd.xml fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-updates-testing/compose/Everything/%s/os/repodata/repomd.xml @@ -235,6 +236,8 @@ fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/co {% if env == 'production' %} fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/%s/repodata/repomd.xml fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/%s/repodata/repomd.xml +fedora_28_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/Everything/%s/repodata/repomd.xml +fedora_28_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/Everything/%s/repodata/repomd.xml {% elif env == 'staging' %} fedora_stable_alt_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-updates/compose/Everything/%s/os/repodata/repomd.xml fedora_testing_alt_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-updates-testing/compose/Everything/%s/os/repodata/repomd.xml