From e1c8159ec921ba10ecc797f938bd92a64de919a6 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 13 Oct 2017 09:09:46 +0000 Subject: [PATCH] Update bodhi staging config for pungi code Signed-off-by: Patrick Uiterwijk --- roles/bodhi2/base/templates/staging.ini.j2 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2 index 4b54182025..d3fc19edd9 100644 --- a/roles/bodhi2/base/templates/staging.ini.j2 +++ b/roles/bodhi2/base/templates/staging.ini.j2 @@ -91,6 +91,9 @@ releng_fedmsg_certname = shell-bodhi-backend01.stg.phx2.fedoraproject.org # Where to symlink the latest repos by their tag name # mash_stage_dir = /var/cache/bodhi/mashed +pungi_conf = /etc/bodhi/fedora-atomic.conf +mash_dir = /mnt/koji/compose/updates/ +mash_stage_dir = /mnt/koji/compose/updates/ mash_conf = /etc/bodhi/mash.conf createrepo_cache_dir = /var/cache/createrepo @@ -107,9 +110,6 @@ comps_url = https://pagure.io/fedora-comps.git ## Mirror settings ## file_url = http://download.fedoraproject.org/pub/fedora/linux/updates -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_epel_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml' # {release}_{request}_master_repomd: This is used by the masher to determine when a # primary architecture push has been synchronized to the master mirror for a given release and @@ -119,8 +119,8 @@ fedora_epel_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/epel/% # 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 # version and the second will be replaced with the architecture. -fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/%s/repodata/repomd.xml -fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/%s/repodata/repomd.xml +fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/%(release)s-updates/compose/Everything/%(arch)s/os/repodata/repomd.xml +fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/%(release)s-updates-testing/compose/Everything/%(arch)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 @@ -132,8 +132,8 @@ fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub # 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 be # replaced with the architecture. -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_stable_alt_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/%(release)s-updates/compose/Everything/%(arch)s/os/repodata/repomd.xml +fedora_testing_alt_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/%(release)s-updates-testing/compose/Everything/%(arch)s/os/repodata/repomd.xml ## The base url of this application