From a7ce4dfbf60faf9c734a179b225b66bd998083ba Mon Sep 17 00:00:00 2001 From: mprahl Date: Wed, 28 Nov 2018 20:27:52 +0000 Subject: [PATCH] Revert "Rename the MBS configuration option of KOJI_ARCHES to ARCHES for v2.8.1" This must be reverted because the configuration got applied to production somehow, which is causing module builds to fail since production isn't 2.8.1 yet. This reverts commit 8f777008e67f85624a45919a8cc3ea73d81e867e. --- roles/mbs/common/templates/config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index 54413e8513..fb092125e7 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -28,7 +28,7 @@ class BaseConfiguration(object): MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.prod'] KOJI_CONFIG = '/etc/module-build-service/koji.conf' KOJI_PROFILE = 'koji' - ARCHES = ['i686', 'armv7hl', 'x86_64'] + KOJI_ARCHES = ['i686', 'armv7hl', 'x86_64'] KOJI_PROXYUSER = True KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' COPR_CONFIG = '/etc/module-build-service/copr.conf' @@ -134,7 +134,7 @@ class ProdConfiguration(BaseConfiguration): KOJI_CONFIG = path.join(confdir, 'koji.conf') {% if env == 'staging' %} KOJI_PROFILE = 'staging' - ARCHES = ['aarch64', 'x86_64', 'i686'] + KOJI_ARCHES = ['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' @@ -144,8 +144,8 @@ class ProdConfiguration(BaseConfiguration): {% else %} KOJI_PROFILE = 'production' - ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x'] - BASE_MODULE_ARCHES = { + KOJI_ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x'] + BASE_MODULE_KOJI_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'],