From 0b8ad00b11cabccf675b54166f4f6e686370763c Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Thu, 8 Nov 2018 19:34:00 +0000 Subject: [PATCH] Adjust Bodhi's production.ini to use %% instead of % in values. See https://github.com/fedora-infra/bodhi/issues/2717 Signed-off-by: Randy Barlow --- roles/bodhi2/base/templates/production.ini.j2 | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index ca54babdd2..cf85e925bd 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -14,9 +14,9 @@ filter-with = proxy-prefix # The bodhi-approve-testing cron job will post this message as a comment from the bodhi user on # updates that reach the required time in testing if they are not stable yet. Positional -# substitution is used, and the %d will be replaced with the time in testing required for the +# substitution is used, and the %%d will be replaced with the time in testing required for the # update. -# testing_approval_msg = This update has reached %d days in testing and can be pushed to stable now if the maintainer wishes +# testing_approval_msg = This update has reached %%d days in testing and can be pushed to stable now if the maintainer wishes # not_yet_tested_msg = This update has not yet met the minimum testing requirements defined in the Package Update Acceptance Criteria @@ -235,32 +235,32 @@ container.source_registry = candidate-registry.stg.fedoraproject.org # expected value, and will poll the URL until this test passes. Substitute release and request # for each release id (replacing -'s with _'s) and request (stable, testing). Used for the # arches listed in {release}_{version}_primary_arches when it is defined, else used for all -# arches. You must put two %s's in this setting - the first will be replaced with the release +# arches. You must put two %%s's in this setting - the first will be replaced with the release # version and the second will be replaced with the architecture. # If a version of the option exists with a matching version, it has priority over one without. # examples (these settings do not have defaults): -# fedora_stable_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_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/%s/repodata/repomd.xml -# 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_stable_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_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/%%s/repodata/repomd.xml +# 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 {% if env == 'production' %} -fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/Everything/%s/repodata/repomd.xml -fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/Everything/%s/repodata/repomd.xml +fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/Everything/%%s/repodata/repomd.xml +fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Everything/%%s/repodata/repomd.xml # Fedora 28 changed the repo layout, so the next two lines are overrides until Fedora 27 goes EOL (and then they can be dropped). -fedora_27_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/%s/repodata/repomd.xml -fedora_27_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/%s/repodata/repomd.xml -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/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 +fedora_27_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/%%s/repodata/repomd.xml +fedora_27_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/%%s/repodata/repomd.xml +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/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 -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 = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates/compose/Everything/%s/os/repodata/repomd.xml -fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates-testing/compose/Everything/%s/os/repodata/repomd.xml +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 +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 = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates/compose/Everything/%%s/os/repodata/repomd.xml +fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml {% endif %} # {release}_({version}_){request}_alt_master_repomd: This is used by the masher to determine when a @@ -269,22 +269,22 @@ fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/co # expected value, and will poll the URL until this test passes. Substitute release and request # for each release id (replacing -'s with _'s) and request (stable, testing). Used for the # arches not listed in {release}_{version}_primary_arches if it is defined. You must put two -# %s's in this setting - the first will be replaced with the release version and the second will +# %%s's in this setting - the first will be replaced with the release version and the second will # be replaced with the architecture. # If a version of the option exists with a matching version, it has priority over one without. # examples (these settings do not have defaults): -# fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%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_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/%s/repodata/repomd.xml +# fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%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_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/%%s/repodata/repomd.xml {% if env == 'production' %} -fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/Everything/%s/repodata/repomd.xml -fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/Everything/%s/repodata/repomd.xml +fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%s/Everything/%%s/repodata/repomd.xml +fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/Everything/%%s/repodata/repomd.xml # Fedora 28 changed the repo layout, so the next two lines are overrides until Fedora 27 goes EOL (and then they can be dropped). -fedora_27_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/%s/repodata/repomd.xml -fedora_27_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/%s/repodata/repomd.xml +fedora_27_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%s/%%s/repodata/repomd.xml +fedora_27_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/%%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 +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 {% endif %} ## The base url of this application @@ -429,7 +429,7 @@ fedmenu.data_url = https://apps{{env_suffix}}.fedoraproject.org/js/data.js # krb_principal = # krb_keytab = # krb_ccache= -krb_ccache = /tmp/krb5cc_%{uid} +krb_ccache = /tmp/krb5cc_%%{uid} krb_principal = bodhi/bodhi{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }} krb_keytab = /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab @@ -468,27 +468,27 @@ pdc_url = https://pdc{{env_suffix}}.fedoraproject.org/ bugtracker = bugzilla # A template that Bodhi will use when commenting on Bugzilla tickets when Updates that reference -# them are created. Positional substitution is used, and the three %s's will be filled in with the +# them are created. Positional substitution is used, and the three %%s's will be filled in with the # update title, the release's long name, and the URL to the update, respectively. -# initial_bug_msg = %s has been submitted as an update to %s. %s +# initial_bug_msg = %%s has been submitted as an update to %%s. %%s # A template that Bodhi will use when commenting on Bugzilla tickets when Updates that reference -# them are marked stable. Positional substitution is used, and the first %s will be filled in with +# them are marked stable. Positional substitution is used, and the first %%s will be filled in with # the update title and the second will be filled in with the release's long name and the update # status. -# stable_bug_msg = %s has been pushed to the %s repository. If problems still persist, please make note of it in this bug report. +# stable_bug_msg = %%s has been pushed to the %%s repository. If problems still persist, please make note of it in this bug report. -# The following two templates are used to comment on Bugzilla tickets. %s will be substituted with +# The following two templates are used to comment on Bugzilla tickets. %%s will be substituted with # the update's URL. The first is used for all updates, unless the epel setting in defined, which # will be used for all Updates on Releases that have an id_prefix of FEDORA-EPEL. # testing_bug_msg = # See https://fedoraproject.org/wiki/QA:Updates_Testing for # instructions on how to install test updates. -# You can provide feedback for this update here: %s +# You can provide feedback for this update here: %%s # testing_bug_epel_msg = # See https://fedoraproject.org/wiki/QA:Updates_Testing for # instructions on how to install test updates. -# You can provide feedback for this update here: %s +# You can provide feedback for this update here: %%s ## @@ -511,12 +511,12 @@ bz_server = https://partner-bugzilla.redhat.com/xmlrpc.cgi # bz_products = bz_products = Fedora,Fedora EPEL -# A template to use for links to Bugzilla tickets. %s will be filled in with the bug number. -# buglink = https://bugzilla.redhat.com/show_bug.cgi?id=%s +# A template to use for links to Bugzilla tickets. %%s will be filled in with the bug number. +# buglink = https://bugzilla.redhat.com/show_bug.cgi?id=%%s {% if env == 'production' %} -buglink = https://bugzilla.redhat.com/show_bug.cgi?id=%s +buglink = https://bugzilla.redhat.com/show_bug.cgi?id=%%s {% elif env == 'staging' %} -buglink = https://partner-bugzilla.redhat.com/show_bug.cgi?id=%s +buglink = https://partner-bugzilla.redhat.com/show_bug.cgi?id=%%s {% endif %} ##