From 6d2437261dd2bdc7c3123905fd9a079edc1add7c Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Fri, 7 Jul 2017 21:51:28 +0000 Subject: [PATCH] Configure Bodhi to know about F26's alternative arches. Signed-off-by: Randy Barlow --- roles/bodhi2/base/templates/production.ini.j2 | 33 +++++++++++++++++++ roles/bodhi2/base/templates/staging.ini.j2 | 33 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index e8e372a019..780e5ed9a3 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -149,14 +149,47 @@ master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/update 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 +# request. The masher will verify that the checksum of repomd.xml at the master URL matches the +# 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 +# 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_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 +# {release}_{request}_alt_master_repomd: This is used by the masher to determine when a +# secondary architecture push has been synchronized to the master mirror for a given release and +# request. The masher will verify that the checksum of repomd.xml at the master URL matches the +# 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 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 + + ## The base url of this application base_address = https://bodhi.fedoraproject.org/ + +## Primary architechures by release +## +## {release}_{version}_primary_arches: Releases that have alternative arches must define their +## primary arches here. Any arches found during mashing that are not present here are asssumed +## to be alternative arches. This is used during the wait_for_repo() step of the mash where +## Bodhi polls the master repo to find out whether the mash has made it to the repo or not. +## Bodhi looks for primary arches with the {release}_{request}_master_repomd setting above, and +## for alternative arches at the {release}_{request}_alt_master_repomd setting above. If this +## is not set, Bodhi will assume the release only has primary arches. +fedora_26_primary_arches = armhfp x86_64 + + ## Supported update types update_types = bugfix enhancement security newpackage diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2 index 360d625ee9..41ebefa37f 100644 --- a/roles/bodhi2/base/templates/staging.ini.j2 +++ b/roles/bodhi2/base/templates/staging.ini.j2 @@ -111,14 +111,47 @@ master_repomd = 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updat 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 +# request. The masher will verify that the checksum of repomd.xml at the master URL matches the +# 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 +# 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_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 +# {release}_{request}_alt_master_repomd: This is used by the masher to determine when a +# secondary architecture push has been synchronized to the master mirror for a given release and +# request. The masher will verify that the checksum of repomd.xml at the master URL matches the +# 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 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 + + ## The base url of this application base_address = https://bodhi.stg.fedoraproject.org/ + +## Primary architechures by release +## +## {release}_{version}_primary_arches: Releases that have alternative arches must define their +## primary arches here. Any arches found during mashing that are not present here are asssumed +## to be alternative arches. This is used during the wait_for_repo() step of the mash where +## Bodhi polls the master repo to find out whether the mash has made it to the repo or not. +## Bodhi looks for primary arches with the {release}_{request}_master_repomd setting above, and +## for alternative arches at the {release}_{request}_alt_master_repomd setting above. If this +## is not set, Bodhi will assume the release only has primary arches. +fedora_26_primary_arches = armhfp x86_64 + + ## Supported update types update_types = bugfix enhancement security newpackage