From ddc13372a6a572fff004a98b9d83e85c9100cc34 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Sep 16 2020 07:54:31 +0000
Subject: EPEL8: no package.cfg in new branches


Currently, when a maintainer requests an epel8 branch,
they also get an epel8-playground branch,
and a package.cfg file is put in their epel8 branch.

The EPEL Steering Committee has agreed on a new vision for EPEL8 Playground,
that doesn't include automatic building of all epel8 packages.
This removes the step that adds package.cfg to the epel8 branch.

So, when a maintainer requests an epel8 branch,
they also get an epel8-playground branch,
but that's it.
No package.cfg is added to either branch.

Fixes https://pagure.io/fedora-infrastructure/issue/9322
Fixes https://pagure.io/fedscm-admin/issue/48

---

diff --git a/fedscm_admin/git.py b/fedscm_admin/git.py
index 8c5f585..f9e2e21 100644
--- a/fedscm_admin/git.py
+++ b/fedscm_admin/git.py
@@ -231,7 +231,7 @@ class GitRepo(object):
 
     def create_epel_package_cfg(self, namespace, repo, branch):
         """
-        Create package.cfg file in epel branch
+        Create package.cfg file in epel branch (currently unused but kept)
         :param namespace: the dist-git namespace of the package in question.
         :param repo: the name of the dist-git repo in question.
         :param branch: the name of the branch
diff --git a/fedscm_admin/utils.py b/fedscm_admin/utils.py
index b01a060..23436a9 100644
--- a/fedscm_admin/utils.py
+++ b/fedscm_admin/utils.py
@@ -804,7 +804,7 @@ def new_git_branch(namespace, repo, branch, use_master=False):
             namespace, repo, branch, from_branch='master')
     else:
         # Even though the branches are created using pagure api which dont
-        # require ssh, but for epel\d branches we add package.cfg file.
+        # require ssh, but the code supports adding package.cfg file.
         # This should be pushed using ssh.
         git_url = fedscm_admin.pagure.get_project_git_url(
             namespace, repo, url_type='ssh',
@@ -816,12 +816,6 @@ def new_git_branch(namespace, repo, branch, use_master=False):
                                   'git branch can\'t be created.')
         fedscm_admin.pagure.new_branch(
             namespace, repo, branch, from_commit=git_obj.first_commit)
-        # If epel\d branch, then create package.cfg file in that branch
-        # Remove the check for epel version > 7 when playground is enabled
-        # for epel7
-        if (bool(re.match(r'^(?:epel)\d+$', branch)) and
-                int(''.join([i for i in branch if re.match(r'\d', i)])) > 7):
-            git_obj.create_epel_package_cfg(namespace, repo, branch)
 
 
 def ticket_requires_approval(issue_type, issue):