infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Allow a separate flatpaks/ namespace in production

Browse source 
Adjust the production distgit and MBS configuration to allow
having a separate flatpaks/ namespace and building from there.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
This commit is contained in:
Owen W. Taylor 2019-03-05 17:36:35 +00:00 • committed by Kevin Fenzi
parent ceba590393
commit 4e5928d055
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/distgit/pagure/templates/pagure.cfg
View file

@ -214,11 +214,7 @@ LOGGING = {
# Configuration item that are specific for this odd pagure instance # Configuration item that are specific for this odd pagure instance
ENABLE_UI_NEW_PROJECTS = False ENABLE_UI_NEW_PROJECTS = False
{% if env == 'staging' %}
ALLOWED_PREFIX = ['rpms', 'modules', 'flatpaks', 'container', 'tests'] ALLOWED_PREFIX = ['rpms', 'modules', 'flatpaks', 'container', 'tests']
{% else %}
ALLOWED_PREFIX = ['rpms', 'modules', 'container', 'tests']
{% endif %}
EXCLUDE_GROUP_INDEX = ['packager'] EXCLUDE_GROUP_INDEX = ['packager']
PRIVATE_PROJECTS = False PRIVATE_PROJECTS = False
{% if env == 'staging' %} {% if env == 'staging' %}
@ -248,9 +244,7 @@ ACLS = {
REQUIRED_GROUPS = { REQUIRED_GROUPS = {
'container/*': ['packager'], 'container/*': ['packager'],
{% if env == 'staging' %}
'flatpaks/*': ['packager'], 'flatpaks/*': ['packager'],
{% endif %}
'modules/*': ['packager'], 'modules/*': ['packager'],
'rpms/*': ['packager'], 'rpms/*': ['packager'],
} }

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

@ -158,7 +158,10 @@ class ProdConfiguration(BaseConfiguration):
PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1' PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'
SCMURLS = ['git+https://src.fedoraproject.org/modules/', SCMURLS = ['git+https://src.fedoraproject.org/modules/',
'https://src.fedoraproject.org/modules/', 'https://src.fedoraproject.org/modules/',
'https://src.fedoraproject.org/git/modules/'] 'https://src.fedoraproject.org/git/modules/',
'git+https://src.fedoraproject.org/flatpaks/',
'https://src.fedoraproject.org/flatpaks/',
'https://src.fedoraproject.org/git/flatpaks/']
{% endif %} {% endif %}
RESOLVER = "db" RESOLVER = "db"