From 40d34067d8a3e28f1eff3052e1946b37e283a810 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 20 Nov 2014 22:25:34 -0500 Subject: [PATCH] Cleanup gerrit ACLs For consistency accross all ACLs, remove usage of "refs/*" section and replace with: * Move create ACLs for branches to "ref/heads/*". * Move pushSignedTag to "refs/tags/*" Change-Id: I8648a7b7b245921ddf7146fd9da31ea7b5e31d9d --- gerrit/acls/openstack-dev/hacking.config | 4 +--- gerrit/acls/openstack-infra/elastic-recheck.config | 4 +--- gerrit/acls/openstack-infra/gerrit.config | 8 ++++---- gerrit/acls/openstack-infra/gerritbot.config | 8 ++++---- gerrit/acls/openstack-infra/git-review.config | 8 ++++---- gerrit/acls/openstack-infra/groups.config | 8 ++++---- gerrit/acls/openstack-infra/jenkins-job-builder.config | 4 +--- gerrit/acls/openstack-infra/meetbot.config | 8 ++++---- gerrit/acls/openstack-infra/nose-html-output.config | 8 ++++---- gerrit/acls/openstack-infra/statusbot.config | 8 ++++---- gerrit/acls/openstack-infra/storyboard.config | 8 ++++---- gerrit/acls/openstack/manila.config | 4 +--- gerrit/acls/stackforge/anvil.config | 4 +--- gerrit/acls/stackforge/chef-cookbooks.config | 4 +--- gerrit/acls/stackforge/clouddocs-maven-plugin.config | 4 +--- gerrit/acls/stackforge/driverlog.config | 4 +--- gerrit/acls/stackforge/healthnmon.config | 8 ++++---- gerrit/acls/stackforge/magnetodb.config | 4 +--- gerrit/acls/stackforge/packstack.config | 4 +--- gerrit/acls/stackforge/puppet-ceph.config | 4 +--- gerrit/acls/stackforge/puppet-modules.config | 4 +--- gerrit/acls/stackforge/python-jenkins.config | 4 +--- gerrit/acls/stackforge/rally.config | 8 ++++---- gerrit/acls/stackforge/stackalytics.config | 8 ++++---- 24 files changed, 57 insertions(+), 83 deletions(-) diff --git a/gerrit/acls/openstack-dev/hacking.config b/gerrit/acls/openstack-dev/hacking.config index 8ad286bd29..a6935df103 100644 --- a/gerrit/acls/openstack-dev/hacking.config +++ b/gerrit/acls/openstack-dev/hacking.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group hacking-release - [access "refs/heads/*"] abandon = group hacking-core +create = group hacking-release label-Code-Review = -2..+2 group hacking-core label-Workflow = -1..+1 group hacking-core diff --git a/gerrit/acls/openstack-infra/elastic-recheck.config b/gerrit/acls/openstack-infra/elastic-recheck.config index 2f7476b2d8..2290d90609 100644 --- a/gerrit/acls/openstack-infra/elastic-recheck.config +++ b/gerrit/acls/openstack-infra/elastic-recheck.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group elastic-recheck-release - [access "refs/heads/*"] abandon = group elastic-recheck-core +create = group elastic-recheck-release label-Code-Review = -2..+2 group elastic-recheck-core label-Workflow = -1..+1 group elastic-recheck-core diff --git a/gerrit/acls/openstack-infra/gerrit.config b/gerrit/acls/openstack-infra/gerrit.config index 24520b32c7..d6247cc0fb 100644 --- a/gerrit/acls/openstack-infra/gerrit.config +++ b/gerrit/acls/openstack-infra/gerrit.config @@ -1,12 +1,9 @@ -[access "refs/*"] -create = group infra-core -pushSignedTag = group infra-core - [access "refs/for/refs/heads/upstream/*"] pushMerge = group infra-core [access "refs/heads/*"] abandon = group infra-core +create = group infra-core forgeAuthor = group infra-core label-Code-Review = -2..+2 group infra-core label-Workflow = -1..+1 group infra-core @@ -19,6 +16,9 @@ push = group infra-core pushMerge = group infra-core pushSignedTag = group infra-core +[access "refs/tags/*"] +pushSignedTag = group infra-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack-infra/gerritbot.config b/gerrit/acls/openstack-infra/gerritbot.config index a56e9b73f4..6d32cf89d9 100644 --- a/gerrit/acls/openstack-infra/gerritbot.config +++ b/gerrit/acls/openstack-infra/gerritbot.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group infra-core -pushSignedTag = group infra-core - [access "refs/heads/*"] abandon = group infra-core +create = group infra-core label-Code-Review = -2..+2 group infra-core label-Workflow = -1..+1 group infra-core +[access "refs/tags/*"] +pushSignedTag = group infra-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack-infra/git-review.config b/gerrit/acls/openstack-infra/git-review.config index a56e9b73f4..6d32cf89d9 100644 --- a/gerrit/acls/openstack-infra/git-review.config +++ b/gerrit/acls/openstack-infra/git-review.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group infra-core -pushSignedTag = group infra-core - [access "refs/heads/*"] abandon = group infra-core +create = group infra-core label-Code-Review = -2..+2 group infra-core label-Workflow = -1..+1 group infra-core +[access "refs/tags/*"] +pushSignedTag = group infra-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack-infra/groups.config b/gerrit/acls/openstack-infra/groups.config index d4f85898bd..1f067fe2ba 100644 --- a/gerrit/acls/openstack-infra/groups.config +++ b/gerrit/acls/openstack-infra/groups.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group groups-core -pushSignedTag = group groups-core - [access "refs/heads/*"] abandon = group groups-core +create = group groups-core label-Code-Review = -2..+2 group groups-core label-Workflow = -1..+1 group groups-core +[access "refs/tags/*"] +pushSignedTag = group groups-core + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/gerrit/acls/openstack-infra/jenkins-job-builder.config b/gerrit/acls/openstack-infra/jenkins-job-builder.config index a1755f15e6..076d94f9b4 100644 --- a/gerrit/acls/openstack-infra/jenkins-job-builder.config +++ b/gerrit/acls/openstack-infra/jenkins-job-builder.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group jenkins-job-builder-release - [access "refs/heads/*"] abandon = group jenkins-job-builder-core +create = group jenkins-job-builder-release label-Code-Review = -2..+2 group jenkins-job-builder-core label-Workflow = -1..+1 group jenkins-job-builder-core diff --git a/gerrit/acls/openstack-infra/meetbot.config b/gerrit/acls/openstack-infra/meetbot.config index 767cbc7eaf..a6a6bb830a 100644 --- a/gerrit/acls/openstack-infra/meetbot.config +++ b/gerrit/acls/openstack-infra/meetbot.config @@ -1,13 +1,13 @@ -[access "refs/*"] -create = group infra-core -pushSignedTag = group infra-core - [access "refs/heads/*"] abandon = group infra-core +create = group infra-core forgeAuthor = group infra-core label-Code-Review = -2..+2 group infra-core label-Workflow = -1..+1 group infra-core +[access "refs/tags/*"] +pushSignedTag = group infra-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack-infra/nose-html-output.config b/gerrit/acls/openstack-infra/nose-html-output.config index 767cbc7eaf..a6a6bb830a 100644 --- a/gerrit/acls/openstack-infra/nose-html-output.config +++ b/gerrit/acls/openstack-infra/nose-html-output.config @@ -1,13 +1,13 @@ -[access "refs/*"] -create = group infra-core -pushSignedTag = group infra-core - [access "refs/heads/*"] abandon = group infra-core +create = group infra-core forgeAuthor = group infra-core label-Code-Review = -2..+2 group infra-core label-Workflow = -1..+1 group infra-core +[access "refs/tags/*"] +pushSignedTag = group infra-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack-infra/statusbot.config b/gerrit/acls/openstack-infra/statusbot.config index a56e9b73f4..6d32cf89d9 100644 --- a/gerrit/acls/openstack-infra/statusbot.config +++ b/gerrit/acls/openstack-infra/statusbot.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group infra-core -pushSignedTag = group infra-core - [access "refs/heads/*"] abandon = group infra-core +create = group infra-core label-Code-Review = -2..+2 group infra-core label-Workflow = -1..+1 group infra-core +[access "refs/tags/*"] +pushSignedTag = group infra-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack-infra/storyboard.config b/gerrit/acls/openstack-infra/storyboard.config index 646f9df8dc..616d05e225 100644 --- a/gerrit/acls/openstack-infra/storyboard.config +++ b/gerrit/acls/openstack-infra/storyboard.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group storyboard-core -pushSignedTag = group storyboard-core - [access "refs/heads/*"] abandon = group storyboard-core +create = group storyboard-core label-Code-Review = -2..+2 group storyboard-core label-Workflow = -1..+1 group storyboard-core +[access "refs/tags/*"] +pushSignedTag = group storyboard-core + [receive] requireChangeId = true diff --git a/gerrit/acls/openstack/manila.config b/gerrit/acls/openstack/manila.config index d149f235ae..c001c9ac6b 100644 --- a/gerrit/acls/openstack/manila.config +++ b/gerrit/acls/openstack/manila.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group manila-core - [access "refs/heads/*"] abandon = group manila-core +create = group manila-core label-Code-Review = -2..+2 group manila-core label-Workflow = -1..+1 group manila-core diff --git a/gerrit/acls/stackforge/anvil.config b/gerrit/acls/stackforge/anvil.config index 0af5fafb45..6083fbdb48 100644 --- a/gerrit/acls/stackforge/anvil.config +++ b/gerrit/acls/stackforge/anvil.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group anvil-core - [access "refs/heads/*"] abandon = group anvil-core +create = group anvil-core label-Code-Review = -2..+2 group anvil-core label-Workflow = -1..+1 group anvil-core diff --git a/gerrit/acls/stackforge/chef-cookbooks.config b/gerrit/acls/stackforge/chef-cookbooks.config index 8da351897e..2f9306a7b8 100644 --- a/gerrit/acls/stackforge/chef-cookbooks.config +++ b/gerrit/acls/stackforge/chef-cookbooks.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group chef-manager-core - [access "refs/heads/*"] abandon = group chef-manager-core +create = group chef-manager-core label-Code-Review = -2..+2 group chef-manager-core label-Workflow = -1..+1 group chef-manager-core diff --git a/gerrit/acls/stackforge/clouddocs-maven-plugin.config b/gerrit/acls/stackforge/clouddocs-maven-plugin.config index 27fd3ec006..71c2c778c7 100644 --- a/gerrit/acls/stackforge/clouddocs-maven-plugin.config +++ b/gerrit/acls/stackforge/clouddocs-maven-plugin.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group clouddocs-maven-plugin-core - [access "refs/heads/*"] abandon = group clouddocs-maven-plugin-core +create = group clouddocs-maven-plugin-core label-Code-Review = -2..+2 group clouddocs-maven-plugin-core label-Workflow = -1..+1 group clouddocs-maven-plugin-core diff --git a/gerrit/acls/stackforge/driverlog.config b/gerrit/acls/stackforge/driverlog.config index 904f55f927..f7a0298855 100644 --- a/gerrit/acls/stackforge/driverlog.config +++ b/gerrit/acls/stackforge/driverlog.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group driverlog-release - [access "refs/heads/*"] abandon = group driverlog-core +create = group driverlog-release label-Code-Review = -2..+2 group driverlog-core label-Workflow = -1..+1 group driverlog-core diff --git a/gerrit/acls/stackforge/healthnmon.config b/gerrit/acls/stackforge/healthnmon.config index 6b1c4d803f..25e5c3fba4 100644 --- a/gerrit/acls/stackforge/healthnmon.config +++ b/gerrit/acls/stackforge/healthnmon.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group healthnmon-core -pushSignedTag = group healthnmon-core - [access "refs/heads/*"] abandon = group healthnmon-core +create = group healthnmon-core label-Code-Review = -2..+2 group healthnmon-core label-Workflow = -1..+1 group healthnmon-core +[access "refs/tags/*"] +pushSignedTag = group healthnmon-core + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/gerrit/acls/stackforge/magnetodb.config b/gerrit/acls/stackforge/magnetodb.config index 64fa1a9692..14b4e78cca 100644 --- a/gerrit/acls/stackforge/magnetodb.config +++ b/gerrit/acls/stackforge/magnetodb.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group magnetodb-release - [access "refs/heads/*"] abandon = group magnetodb-core +create = group magnetodb-release label-Code-Review = -2..+2 group magnetodb-core label-Workflow = -1..+1 group magnetodb-core diff --git a/gerrit/acls/stackforge/packstack.config b/gerrit/acls/stackforge/packstack.config index b5d45a2004..11f1aaea50 100644 --- a/gerrit/acls/stackforge/packstack.config +++ b/gerrit/acls/stackforge/packstack.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group packstack-release - [access "refs/heads/*"] abandon = group packstack-core +create = group packstack-release label-Code-Review = -2..+2 group packstack-core label-Workflow = -1..+1 group packstack-core diff --git a/gerrit/acls/stackforge/puppet-ceph.config b/gerrit/acls/stackforge/puppet-ceph.config index d7ea24f183..c2db2640ed 100644 --- a/gerrit/acls/stackforge/puppet-ceph.config +++ b/gerrit/acls/stackforge/puppet-ceph.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group puppet-ceph-core - [access "refs/heads/*"] abandon = group puppet-ceph-core +create = group puppet-ceph-core label-Code-Review = -2..+2 group puppet-ceph-core label-Workflow = -1..+1 group puppet-ceph-core diff --git a/gerrit/acls/stackforge/puppet-modules.config b/gerrit/acls/stackforge/puppet-modules.config index ff981f641e..44efa608de 100644 --- a/gerrit/acls/stackforge/puppet-modules.config +++ b/gerrit/acls/stackforge/puppet-modules.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group puppet-manager-core - [access "refs/heads/*"] abandon = group puppet-manager-core +create = group puppet-manager-core label-Code-Review = -2..+2 group puppet-manager-core label-Workflow = -1..+1 group puppet-manager-core diff --git a/gerrit/acls/stackforge/python-jenkins.config b/gerrit/acls/stackforge/python-jenkins.config index 815e4850bd..e0f165b43d 100644 --- a/gerrit/acls/stackforge/python-jenkins.config +++ b/gerrit/acls/stackforge/python-jenkins.config @@ -1,8 +1,6 @@ -[access "refs/*"] -create = group python-jenkins-release - [access "refs/heads/*"] abandon = group python-jenkins-core +create = group python-jenkins-release label-Code-Review = -2..+2 group python-jenkins-core label-Workflow = -1..+1 group python-jenkins-core diff --git a/gerrit/acls/stackforge/rally.config b/gerrit/acls/stackforge/rally.config index 5515c94d03..53f1b2bb5b 100644 --- a/gerrit/acls/stackforge/rally.config +++ b/gerrit/acls/stackforge/rally.config @@ -1,13 +1,13 @@ -[access "refs/*"] -create = group rally-core -pushSignedTag = group rally-core - [access "refs/heads/*"] abandon = group rally-core +create = group rally-core label-Code-Review = -2..+2 group rally-core label-Workflow = -1..+1 group rally-core rebase = group rally-core +[access "refs/tags/*"] +pushSignedTag = group rally-core + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/gerrit/acls/stackforge/stackalytics.config b/gerrit/acls/stackforge/stackalytics.config index 0df8e9d188..1268ea9b4c 100644 --- a/gerrit/acls/stackforge/stackalytics.config +++ b/gerrit/acls/stackforge/stackalytics.config @@ -1,12 +1,12 @@ -[access "refs/*"] -create = group stackalytics-core -pushSignedTag = group stackalytics-core - [access "refs/heads/*"] abandon = group stackalytics-core +create = group stackalytics-core label-Code-Review = -2..+2 group stackalytics-core label-Workflow = -1..+1 group stackalytics-core +[access "refs/tags/*"] +pushSignedTag = group stackalytics-core + [receive] requireChangeId = true requireContributorAgreement = true