From 1e516e71b598b2f5b952771f0074e05891418db0 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 31 Oct 2019 20:35:37 +0000 Subject: [PATCH] mbs stg config: Drop i686 for f31 and later Signed-off-by: Mohan Boddu --- roles/mbs/common/templates/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index b74f004c81..3615c1e70c 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -127,7 +127,14 @@ class ProdConfiguration(BaseConfiguration): KOJI_CONFIG = path.join(confdir, 'koji.conf') {% if env == 'staging' %} KOJI_PROFILE = 'staging' - ARCHES = ['aarch64', 'x86_64', 'i686'] + ARCHES = ['aarch64', 'x86_64'] + BASE_MODULE_ARCHES = { + # Fedora 31 and later drop 'i686'. Keep it around for older releases. + # https://fedoraproject.org/wiki/Changes/Noi686Repositories + 'platform:f28': ['aarch64', 'x86_64', 'i686'], + 'platform:f29': ['aarch64', 'x86_64', 'i686'], + 'platform:f30': ['aarch64', 'x86_64', 'i686'], + } KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.stg'] PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1'