Greetings!

I would like to file a freeze break request to deploy Bodhi 3.5.0. The
infrastructure team was not notified of several changes to modular
packages until quite recently, and some of these changes required
patching to Bodhi which we were not able to complete before the freeze
began. The 3.5.0 release has these patches, and a few others as well.
You can read the changelog[0], or have a look at the diff from 3.4.0[1].

3.5.0 is deployed to staging and Patrick and I did testing on it tonight
and it is working well. I would like to deploy it tomorrow if I get the
required +1's.

In addition to deploying the release, I would like to also make the
attached changes in Ansible.


[0] https://bodhi.stg.fedoraproject.org/docs/user/release_notes.html
[1] https://github.com/fedora-infra/bodhi/compare/3.4.0...3.5.0
diff --git a/roles/bodhi2/backend/templates/variants.module.xml.j2 b/roles/bodhi2/backend/templates/variants.module.xml.j2
index cb1de76d0..337c33ada 100644
--- a/roles/bodhi2/backend/templates/variants.module.xml.j2
+++ b/roles/bodhi2/backend/templates/variants.module.xml.j2
@@ -12,8 +12,8 @@
                        <arch>x86_64</arch>
                </arches>
                <modules>
-                       [% for module in modules %]
-                               <module>[[ module ]]</module>
+                       [% for module in moduledefs %]
+                               <module>[[ module.name ]]:[[ module.stream ]]:[[ module.version ]]</module>
                        [% endfor %]
                </modules>
        </variant>
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 90eb91e22..a49cfb306 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

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
infrastructure mailing list -- infrastructure@lists.fedoraproject.org
To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org

Reply via email to