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

modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config

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

modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/config.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config

@@ -1,23 +1,23 @@
 [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/*"]
-pushMerge = group openstack-ci-core
+pushMerge = group infra-core
 
 [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/*"]
-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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config

@@ -1,11 +1,11 @@
 [access "refs/*"]
-create = group openstack-ci-core
+create = group infra-core
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config

@@ -1,11 +1,11 @@
 [access "refs/*"]
-create = group openstack-ci-admins
+create = group infra-core
-pushSignedTag = group openstack-ci-admins
+pushSignedTag = group infra-core
 
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config

@@ -1,12 +1,12 @@
 [access "refs/*"]
-create = group openstack-ci-core
+create = group infra-core
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config

@@ -1,13 +1,13 @@
 [access "refs/for/refs/*"]
-pushMerge = group openstack-ci-core
+pushMerge = group infra-core
 
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config

@@ -1,12 +1,12 @@
 [access "refs/*"]
-create = group openstack-ci-core
+create = group infra-core
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-admins
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config

@@ -1,14 +1,14 @@
 [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"]
-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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config

@@ -1,14 +1,14 @@
 [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"]
-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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config

@@ -1,17 +1,17 @@
 [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"]
-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/*"]
-pushSignedTag = group openstack-ci-admins
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config

@@ -1,7 +1,7 @@
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config

@@ -1,11 +1,11 @@
 [access "refs/*"]
-create = group openstack-ci-core
+create = group infra-core
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [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]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config

@@ -1,10 +1,10 @@
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config

@@ -1,13 +1,13 @@
 [access "refs/for/refs/*"]
-pushMerge = group openstack-ci-core
+pushMerge = group infra-core
 
 [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/*"]
-pushSignedTag = group openstack-ci-core
+pushSignedTag = group infra-core
 
 [receive]
 requireChangeId = true

modules/openstack_project/files/gerrit/acls/test-manage-project.config

@@ -1,12 +1,12 @@
 [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"]
-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]
 requireChangeId = true

tools/normalize_acl.py

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