Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Rename the MBS configuration option of KOJI_ARCHES to ARCHES for v2.8.1

Browse source
This commit is contained in:
mprahl 2018-11-19 21:06:12 +00:00
parent 1830d5d13e
commit 8f777008e6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/mbs/common/templates/config.py
View file

@ -28,7 +28,7 @@ class BaseConfiguration(object):
MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.prod'] MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.prod']
KOJI_CONFIG = '/etc/module-build-service/koji.conf' KOJI_CONFIG = '/etc/module-build-service/koji.conf'
KOJI_PROFILE = 'koji' KOJI_PROFILE = 'koji'
KOJI_ARCHES = ['i686', 'armv7hl', 'x86_64'] ARCHES = ['i686', 'armv7hl', 'x86_64']
KOJI_PROXYUSER = True KOJI_PROXYUSER = True
KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'
COPR_CONFIG = '/etc/module-build-service/copr.conf' COPR_CONFIG = '/etc/module-build-service/copr.conf'
@ -134,7 +134,7 @@ class ProdConfiguration(BaseConfiguration):
KOJI_CONFIG = path.join(confdir, 'koji.conf') KOJI_CONFIG = path.join(confdir, 'koji.conf')
{% if env == 'staging' %} {% if env == 'staging' %}
KOJI_PROFILE = 'staging' KOJI_PROFILE = 'staging'
KOJI_ARCHES = ['aarch64', 'x86_64', 'i686'] ARCHES = ['aarch64', 'x86_64', 'i686']
KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'
MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.stg'] MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.stg']
PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1' PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1'
@ -144,8 +144,8 @@ class ProdConfiguration(BaseConfiguration):
{% else %} {% else %}
KOJI_PROFILE = 'production' KOJI_PROFILE = 'production'
KOJI_ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x'] ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x']
BASE_MODULE_KOJI_ARCHES = { BASE_MODULE_ARCHES = {
# Fedora 28 includes 'ppc64'. F29 and later drops it. # Fedora 28 includes 'ppc64'. F29 and later drops it.
# https://fedoraproject.org/wiki/Changes/DiscontinuePPC64 # https://fedoraproject.org/wiki/Changes/DiscontinuePPC64
'platform:f28': ['aarch64', 'armv7hl', 'i686', 'ppc64', 'ppc64le', 'x86_64', 's390x'], 'platform:f28': ['aarch64', 'armv7hl', 'i686', 'ppc64', 'ppc64le', 'x86_64', 's390x'],