From fc587753dfb921502d23e3d75337cf7cecfdd648 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 18 May 2020 10:11:08 -0700 Subject: [PATCH] mbs: MBS is using old platforms, this moves both stg and prod to 31. I notice a lot of newRepo failures in koji. THis is due to f29/f28 being eol and no longer having buildroot repos for mbs to merge things with. I am not 100% sure this is the old change needed, but submitting this to get feeback. Signed-off-by: Kevin Fenzi --- roles/mbs/common/templates/config.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index c4d947cd33..c5bb4d5ba8 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -129,11 +129,7 @@ class ProdConfiguration(BaseConfiguration): KOJI_PROFILE = 'staging' ARCHES = ['aarch64', 'ppc64le', 's390x', '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'], + 'platform:f31': ['aarch64', 'x86_64'], } KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.stg'] @@ -152,9 +148,7 @@ class ProdConfiguration(BaseConfiguration): KOJI_PROFILE = 'production' ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x'] BASE_MODULE_ARCHES = { - # Fedora 28 includes 'ppc64'. F29 and later drops it. - # https://fedoraproject.org/wiki/Changes/DiscontinuePPC64 - 'platform:f28': ['aarch64', 'armv7hl', 'i686', 'ppc64', 'ppc64le', 'x86_64', 's390x'], + 'platform:f31': ['aarch64', 'armv7hl', 'ppc64le', 'x86_64', 's390x'], 'platform:el8' : ['aarch64', 'ppc64le', 'x86_64', 's390x'] } KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos'