Combine infra/ci core/admin gerrit groups

This is the result of running:

    find modules/openstack_project/files/gerrit/acls/ -type f \
        -name "*.config" -exec ./tools/normalize_acl.py {} 6 \;

Change-Id: I7aa27b859529b2bc8a990d6272334222996cbbc4
This commit is contained in:
Jeremy Stanley 2014-06-30 17:30:45 +00:00
parent b9b29085f1
commit fac5624859
29 changed files with 144 additions and 134 deletions

View File

@ -11,7 +11,7 @@ label-Verified = -1..+1 group Third-Party CI
label-Workflow = -1..+1 group Registered Users label-Workflow = -1..+1 group Registered Users
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,23 +1,23 @@
[access "refs/*"] [access "refs/*"]
create = group openstack-ci-core create = group infra-core
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[access "refs/for/refs/heads/upstream/*"] [access "refs/for/refs/heads/upstream/*"]
pushMerge = group openstack-ci-core pushMerge = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
forgeAuthor = group openstack-ci-admins forgeAuthor = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/heads/upstream/*"] [access "refs/heads/upstream/*"]
create = group openstack-ci-core create = group infra-core
forgeAuthor = group openstack-ci-core forgeAuthor = group infra-core
forgeCommitter = group openstack-ci-core forgeCommitter = group infra-core
push = group openstack-ci-core push = group infra-core
pushMerge = group openstack-ci-core pushMerge = group infra-core
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,11 +1,11 @@
[access "refs/*"] [access "refs/*"]
create = group openstack-ci-core create = group infra-core
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,11 +1,11 @@
[access "refs/*"] [access "refs/*"]
create = group openstack-ci-admins create = group infra-core
pushSignedTag = group openstack-ci-admins pushSignedTag = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,12 +1,12 @@
[access "refs/*"] [access "refs/*"]
create = group openstack-ci-core create = group infra-core
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
forgeAuthor = group openstack-ci-admins forgeAuthor = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,13 +1,13 @@
[access "refs/for/refs/*"] [access "refs/for/refs/*"]
pushMerge = group openstack-ci-core pushMerge = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,12 +1,12 @@
[access "refs/*"] [access "refs/*"]
create = group openstack-ci-core create = group infra-core
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
forgeAuthor = group openstack-ci-core forgeAuthor = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-admins pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,14 +1,14 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[access "refs/meta/config"] [access "refs/meta/config"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Verified = -2..+2 group openstack-ci-admins label-Verified = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
submit = group openstack-ci-admins submit = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,14 +1,14 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[access "refs/meta/config"] [access "refs/meta/config"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Verified = -2..+2 group openstack-ci-admins label-Verified = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
submit = group openstack-ci-admins submit = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,17 +1,17 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[access "refs/meta/config"] [access "refs/meta/config"]
abandon = group openstack-ci-admins abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Verified = -2..+2 group openstack-ci-admins label-Verified = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
submit = group openstack-ci-admins submit = group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-admins pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,7 +1,7 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,11 +1,11 @@
[access "refs/*"] [access "refs/*"]
create = group openstack-ci-core create = group infra-core
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,10 +1,10 @@
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,13 +1,13 @@
[access "refs/for/refs/*"] [access "refs/for/refs/*"]
pushMerge = group openstack-ci-core pushMerge = group infra-core
[access "refs/heads/*"] [access "refs/heads/*"]
abandon = group openstack-ci-core abandon = group infra-core
label-Code-Review = -2..+2 group openstack-ci-core label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-core label-Workflow = -1..+1 group infra-core
[access "refs/tags/*"] [access "refs/tags/*"]
pushSignedTag = group openstack-ci-core pushSignedTag = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -1,12 +1,12 @@
[access "refs/heads/*"] [access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
[access "refs/meta/config"] [access "refs/meta/config"]
label-Code-Review = -2..+2 group openstack-ci-admins label-Code-Review = -2..+2 group infra-core
label-Verified = -2..+2 group openstack-ci-admins label-Verified = -2..+2 group infra-core
label-Workflow = -1..+1 group openstack-ci-admins label-Workflow = -1..+1 group infra-core
submit = group openstack-ci-admins submit = group infra-core
[receive] [receive]
requireChangeId = true requireChangeId = true

View File

@ -9,6 +9,7 @@
# 3 - remove any project.stat{e,us} = active since it's a default or a typo # 3 - remove any project.stat{e,us} = active since it's a default or a typo
# 4 - strip default *.owner = group Administrators permissions # 4 - strip default *.owner = group Administrators permissions
# 5 - sort the exclusiveGroupPermissions group lists # 5 - sort the exclusiveGroupPermissions group lists
# 6 - replace openstack-ci-admins and openstack-ci-core with infra-core
import re import re
import sys import sys
@ -95,6 +96,15 @@ if '5' in transformations:
newsection.append(option) newsection.append(option)
acl[section] = newsection acl[section] = newsection
if '6' in transformations:
for section in acl.keys():
newsection = []
for option in acl[section]:
for group in ('openstack-ci-admins', 'openstack-ci-core'):
option = option.replace('group %s' % group, 'group infra-core')
newsection.append(option)
acl[section] = newsection
for section in sorted(acl.keys()): for section in sorted(acl.keys()):
if acl[section]: if acl[section]:
out += '\n[%s]\n' % section out += '\n[%s]\n' % section