WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-05-04 23:15:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prepare staging for a separate flatpaks/ namespace

Browse Source 
Change the distgit staging configuration to allow a flatpaks/ namespace,
and configure Koji and MBS to allow building from there.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
This commit is contained in:
Owen W. Taylor
2019-03-05 17:34:38 +00:00
committed by Kevin Fenzi
parent 1319bc99f5
commit 76197fc4d0
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roles/distgit/pagure/templates/pagure.cfg
View File

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

2
roles/koji_builder/templates/kojid.conf
View File

@@ -81,6 +81,7 @@ allowed_scms=
!src.stg.fedoraproject.org:/forks/*
!src.stg.fedoraproject.org:/cgit/*
src.stg.fedoraproject.org:/container/*:false
src.stg.fedoraproject.org:/flatpaks/*:false
src.stg.fedoraproject.org:/git/rpms/*:false:fedpkg,sources
!src.stg.fedoraproject.org:/git/*
!pkgs.stg.fedoraproject.org:/fork/*
@@ -88,6 +89,7 @@ allowed_scms=
!pkgs.stg.fedoraproject.org:/cgit/*
!pkgs.stg.fedoraproject.org:/git/*
pkgs.stg.fedoraproject.org:/container/*:false
pkgs.stg.fedoraproject.org:/flatpaks/*:false
pkgs.stg.fedoraproject.org:/rpms/*:false:fedpkg,sources
pkgs.stg.fedoraproject.org:/*:false:fedpkg,sources
src.stg.fedoraproject.org:/*:false:fedpkg,sources

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

@@ -140,7 +140,10 @@ class ProdConfiguration(BaseConfiguration):
PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1'
SCMURLS = ['git+https://src.stg.fedoraproject.org/modules/',
'https://src.stg.fedoraproject.org/modules/',
'https://src.stg.fedoraproject.org/git/modules/']
'https://src.stg.fedoraproject.org/git/modules/',
'git+https://src.stg.fedoraproject.org/flatpaks/',
'https://src.stg.fedoraproject.org/flatpaks/',
'https://src.stg.fedoraproject.org/git/flatpaks/']
{% else %}
KOJI_PROFILE = 'production'