From 76197fc4d080aa7876377f104073f44d64faa543 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Tue, 5 Mar 2019 17:34:38 +0000
Subject: [PATCH] Prepare staging for a separate flatpaks/ namespace

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>
---
 roles/distgit/pagure/templates/pagure.cfg | 7 +++++++
 roles/koji_builder/templates/kojid.conf   | 2 ++
 roles/mbs/common/templates/config.py      | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg
index 385b804641..ac21ac7bf4 100644
--- a/roles/distgit/pagure/templates/pagure.cfg
+++ b/roles/distgit/pagure/templates/pagure.cfg
@@ -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'],
 }
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 9fbb8216aa..a1eb323385 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -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
diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py
index 278c651a93..3f2ace2224 100644
--- a/roles/mbs/common/templates/config.py
+++ b/roles/mbs/common/templates/config.py
@@ -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'