From 9b83466230006e9f1f1d44a3b15ec80046839115 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 30 Jun 2014 17:30:45 +0000 Subject: [PATCH] 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 --- .../gerrit/acls/openstack-dev/sandbox.config | 2 +- .../acls/openstack-infra/bugdaystats.config | 8 +++--- .../gerrit/acls/openstack-infra/config.config | 6 ++--- .../gerrit/acls/openstack-infra/gear.config | 8 +++--- .../gerrit-verification-status-plugin.config | 6 ++--- .../gerrit/acls/openstack-infra/gerrit.config | 26 +++++++++---------- .../acls/openstack-infra/gerritbot.config | 10 +++---- .../acls/openstack-infra/gerritlib.config | 8 +++--- .../acls/openstack-infra/git-review.config | 10 +++---- .../acls/openstack-infra/infra-specs.config | 6 ++--- .../gerrit/acls/openstack-infra/jeepyb.config | 8 +++--- .../acls/openstack-infra/lodgeit.config | 6 ++--- .../acls/openstack-infra/meetbot.config | 12 ++++----- .../acls/openstack-infra/nodepool.config | 10 +++---- .../openstack-infra/nose-html-output.config | 12 ++++----- .../acls/openstack-infra/publications.config | 8 +++--- .../openstack-infra/puppet-apparmor.config | 16 ++++++------ .../openstack-infra/puppet-dashboard.config | 16 ++++++------ .../openstack-infra/puppet-storyboard.config | 6 ++--- .../openstack-infra/puppet-vcsrepo.config | 18 ++++++------- .../acls/openstack-infra/puppet-vinz.config | 6 ++--- .../acls/openstack-infra/puppet-yum.config | 6 ++--- .../acls/openstack-infra/puppet-zuul.config | 6 ++--- .../acls/openstack-infra/pypi-mirror.config | 8 +++--- .../acls/openstack-infra/statusbot.config | 10 +++---- .../zmq-event-publisher.config | 8 +++--- .../gerrit/acls/openstack-infra/zuul.config | 10 +++---- .../gerrit/acls/test-manage-project.config | 12 ++++----- tools/normalize_acl.py | 10 +++++++ 29 files changed, 144 insertions(+), 134 deletions(-) diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config index b5342ba5fa..3345f28e90 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config +++ b/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 diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config index 9915209477..27dc079338 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config index d4c5e8b61e..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config index 78e9522964..c27ac60faa 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config index d4c5e8b61e..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config +++ b/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 -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config index cf814cee06..24520b32c7 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config @@ -1,23 +1,23 @@ [access "refs/*"] -create = group openstack-ci-core -pushSignedTag = group openstack-ci-core +create = group infra-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 -forgeAuthor = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +forgeAuthor = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/heads/upstream/*"] -create = group openstack-ci-core -forgeAuthor = group openstack-ci-core -forgeCommitter = group openstack-ci-core -push = group openstack-ci-core -pushMerge = group openstack-ci-core -pushSignedTag = group openstack-ci-core +create = group infra-core +forgeAuthor = group infra-core +forgeCommitter = group infra-core +push = group infra-core +pushMerge = group infra-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config index 282e15368a..a56e9b73f4 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config @@ -1,11 +1,11 @@ [access "refs/*"] -create = group openstack-ci-core -pushSignedTag = group openstack-ci-core +create = group infra-core +pushSignedTag = group infra-core [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config index 78e9522964..c27ac60faa 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config index b9ddfd5692..a56e9b73f4 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config @@ -1,11 +1,11 @@ [access "refs/*"] -create = group openstack-ci-admins -pushSignedTag = group openstack-ci-admins +create = group infra-core +pushSignedTag = group infra-core [access "refs/heads/*"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config index 28ec2082c4..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config index 78e9522964..c27ac60faa 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config index 28ec2082c4..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config index fb885d10fd..767cbc7eaf 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config @@ -1,12 +1,12 @@ [access "refs/*"] -create = group openstack-ci-core -pushSignedTag = group openstack-ci-core +create = group infra-core +pushSignedTag = group infra-core [access "refs/heads/*"] -abandon = group openstack-ci-core -forgeAuthor = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +forgeAuthor = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config index 8d5c5f38bd..0b918e43e1 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config +++ b/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 -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config index c126eef644..767cbc7eaf 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config @@ -1,12 +1,12 @@ [access "refs/*"] -create = group openstack-ci-core -pushSignedTag = group openstack-ci-core +create = group infra-core +pushSignedTag = group infra-core [access "refs/heads/*"] -abandon = group openstack-ci-core -forgeAuthor = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +forgeAuthor = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config index ec1ea1ecb4..c27ac60faa 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-admins +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config index a2afaaf74a..e194eee4cb 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config @@ -1,14 +1,14 @@ [access "refs/heads/*"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/meta/config"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Verified = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins -submit = group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Verified = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core +submit = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config index a2afaaf74a..e194eee4cb 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config @@ -1,14 +1,14 @@ [access "refs/heads/*"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/meta/config"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Verified = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins -submit = group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Verified = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core +submit = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config index 28ec2082c4..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config index b81d40fc3a..ae3a66c6e2 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config @@ -1,17 +1,17 @@ [access "refs/heads/*"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/meta/config"] -abandon = group openstack-ci-admins -label-Code-Review = -2..+2 group openstack-ci-admins -label-Verified = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins -submit = group openstack-ci-admins +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Verified = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core +submit = group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-admins +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config index 28ec2082c4..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config index 1bcdef0acc..7cce171c8d 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config index 28ec2082c4..b8f0f04c33 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config @@ -1,7 +1,7 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config index 78e9522964..c27ac60faa 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config index 282e15368a..a56e9b73f4 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config @@ -1,11 +1,11 @@ [access "refs/*"] -create = group openstack-ci-core -pushSignedTag = group openstack-ci-core +create = group infra-core +pushSignedTag = group infra-core [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config index 9915209477..27dc079338 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config @@ -1,10 +1,10 @@ [access "refs/heads/*"] -abandon = group openstack-ci-core -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config index 8d5c5f38bd..0b918e43e1 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config +++ b/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 -label-Code-Review = -2..+2 group openstack-ci-core -label-Workflow = -1..+1 group openstack-ci-core +abandon = group infra-core +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/tags/*"] -pushSignedTag = group openstack-ci-core +pushSignedTag = group infra-core [receive] requireChangeId = true diff --git a/modules/openstack_project/files/gerrit/acls/test-manage-project.config b/modules/openstack_project/files/gerrit/acls/test-manage-project.config index c257351bc2..e69b07cba1 100644 --- a/modules/openstack_project/files/gerrit/acls/test-manage-project.config +++ b/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-Workflow = -1..+1 group openstack-ci-admins +label-Code-Review = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core [access "refs/meta/config"] -label-Code-Review = -2..+2 group openstack-ci-admins -label-Verified = -2..+2 group openstack-ci-admins -label-Workflow = -1..+1 group openstack-ci-admins -submit = group openstack-ci-admins +label-Code-Review = -2..+2 group infra-core +label-Verified = -2..+2 group infra-core +label-Workflow = -1..+1 group infra-core +submit = group infra-core [receive] requireChangeId = true diff --git a/tools/normalize_acl.py b/tools/normalize_acl.py index d8c9b4297c..e3f35bb50c 100755 --- a/tools/normalize_acl.py +++ b/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