From 05caa9f4612edc56589336f1d401787b9aafe2ac Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 02 2021 16:08:41 +0000 Subject: distgit/pagure: simplify RCM_BRANCHES and adjust the list of branches blocked Signed-off-by: Pierre-Yves Chibon --- diff --git a/roles/distgit/pagure/templates/pagure_shared.cfg b/roles/distgit/pagure/templates/pagure_shared.cfg index bae6580..5554572 100644 --- a/roles/distgit/pagure/templates/pagure_shared.cfg +++ b/roles/distgit/pagure/templates/pagure_shared.cfg @@ -69,9 +69,13 @@ BLACKLISTED_GROUPS = ['forks', 'group'] ACL_BLOCK_UNSPECIFIED = False ACL_PROTECTED_NAMESPACES = ['rpms', 'modules', 'container'] RCM_GROUP = 'relenggroup' -RCM_BRANCHES = ['refs/heads/f[0-9]+', 'refs/tags/.*', 'refs/heads/master', 'refs/heads/.*'] +RCM_BRANCHES = ['refs/heads/f[0-9]+', 'refs/tags/.*', 'refs/heads/.*'] # Pushing to c* stuff is never allowed +{% if env == "staging" %} +BLACKLIST_RES = ['refs/heads/c[0-9]+.*', 'refs/heads/master'] +{% else %} BLACKLIST_RES = ['refs/heads/c[0-9]+.*'] +{% endif %} # Pushing to (f|epel|el|olpc)(num+) that is not previously approved # (supported branches, ie: configured and active in PDC) is not allowed. UNSPECIFIED_BLACKLIST_RES = ['master',