Use Oslo core teams for stable maint, too

The Oslo team has decided to fold stable maintenance work into the responsibilities of the core teams (we're small and the overlap on the teams was approaching 100% anyway). This change removes the exclusiveGroupPermissions settings for the stable branches, making the remaining settings additive. It then adds the stable-maint-core team so they can assist the various Oslo teams. Change-Id: Ie4031cbe1ebe7f089a70e1946e234dac07727e85
2015-04-13 20:36:07 +00:00 · 2015-04-13 20:36:07 +00:00 · 05dd82a6a2
commit 05dd82a6a2
parent cec70680f7
19 changed files with 69 additions and 65 deletions
--- a/gerrit/acls/openstack/debtcollector.config
+++ b/gerrit/acls/openstack/debtcollector.config
@ -3,6 +3,11 @@ abandon = group debtcollector-core
 label-Code-Review = -2..+2 group debtcollector-core
 label-Workflow = -1..+1 group debtcollector-core

+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/tags/*"]
 pushSignedTag = group debtcollector-release

--- a/gerrit/acls/openstack/oslo.concurrency.config
+++ b/gerrit/acls/openstack/oslo.concurrency.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-concurrency-core
 label-Workflow = -1..+1 group oslo-concurrency-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-concurrency-release
--- a/gerrit/acls/openstack/oslo.config.config
+++ b/gerrit/acls/openstack/oslo.config.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-core
 label-Workflow = -1..+1 group oslo-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-config-release
--- a/gerrit/acls/openstack/oslo.db.config
+++ b/gerrit/acls/openstack/oslo.db.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-db-core
 label-Workflow = -1..+1 group oslo-db-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-db-release
--- a/gerrit/acls/openstack/oslo.i18n.config
+++ b/gerrit/acls/openstack/oslo.i18n.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-i18n-core
 label-Workflow = -1..+1 group oslo-i18n-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-i18n-release
--- a/gerrit/acls/openstack/oslo.log.config
+++ b/gerrit/acls/openstack/oslo.log.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-core
 label-Workflow = -1..+1 group oslo-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-release
--- a/gerrit/acls/openstack/oslo.messaging.config
+++ b/gerrit/acls/openstack/oslo.messaging.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-messaging-core
 label-Workflow = -1..+1 group oslo-messaging-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-messaging-release
--- a/gerrit/acls/openstack/oslo.middleware.config
+++ b/gerrit/acls/openstack/oslo.middleware.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-middleware-core
 label-Workflow = -1..+1 group oslo-middleware-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-middleware-release
--- a/gerrit/acls/openstack/oslo.policy.config
+++ b/gerrit/acls/openstack/oslo.policy.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-policy-core
 label-Workflow = -1..+1 group oslo-policy-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-policy-release
--- a/gerrit/acls/openstack/oslo.rootwrap.config
+++ b/gerrit/acls/openstack/oslo.rootwrap.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-rootwrap-core
 label-Workflow = -1..+1 group oslo-rootwrap-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-rootwrap-release
--- a/gerrit/acls/openstack/oslo.serialization.config
+++ b/gerrit/acls/openstack/oslo.serialization.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-core
 label-Workflow = -1..+1 group oslo-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-release
--- a/gerrit/acls/openstack/oslo.utils.config
+++ b/gerrit/acls/openstack/oslo.utils.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-core
 label-Workflow = -1..+1 group oslo-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-release
--- a/gerrit/acls/openstack/oslo.versionedobjects.config
+++ b/gerrit/acls/openstack/oslo.versionedobjects.config
@ -4,11 +4,9 @@ label-Code-Review = -2..+2 group oslo-versionedobjects-core
 label-Workflow = -1..+1 group oslo-versionedobjects-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-versionedobjects-release
--- a/gerrit/acls/openstack/oslo.vmware.config
+++ b/gerrit/acls/openstack/oslo.vmware.config
@ -5,11 +5,9 @@ label-Verified = -1..+1 group oslo-vmware-ci
 label-Workflow = -1..+1 group oslo-vmware-core

 [access "refs/heads/stable/*"]
-abandon = group oslo-vmware-stable-maint
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group oslo-vmware-stable-maint
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group oslo-vmware-stable-maint
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core

 [access "refs/tags/*"]
 pushSignedTag = group oslo-vmware-release
--- a/gerrit/acls/openstack/oslosphinx.config
+++ b/gerrit/acls/openstack/oslosphinx.config
@ -3,6 +3,11 @@ abandon = group oslo-core
 label-Code-Review = -2..+2 group oslo-core
 label-Workflow = -1..+1 group oslo-core

+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/tags/*"]
 pushSignedTag = group oslo-release

--- a/gerrit/acls/openstack/oslotest.config
+++ b/gerrit/acls/openstack/oslotest.config
@ -3,6 +3,11 @@ abandon = group oslo-core
 label-Code-Review = -2..+2 group oslo-core
 label-Workflow = -1..+1 group oslo-core

+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/tags/*"]
 pushSignedTag = group oslo-release

--- a/gerrit/acls/openstack/stevedore.config
+++ b/gerrit/acls/openstack/stevedore.config
@ -3,6 +3,11 @@ abandon = group stevedore-core
 label-Code-Review = -2..+2 group stevedore-core
 label-Workflow = -1..+1 group stevedore-core

+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/tags/*"]
 pushSignedTag = group stevedore-release

--- a/gerrit/acls/openstack/taskflow.config
+++ b/gerrit/acls/openstack/taskflow.config
@ -3,6 +3,11 @@ abandon = group taskflow-core
 label-Code-Review = -2..+2 group taskflow-core
 label-Workflow = -1..+1 group taskflow-core

+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/tags/*"]
 pushSignedTag = group taskflow-release

--- a/gerrit/acls/openstack/tooz.config
+++ b/gerrit/acls/openstack/tooz.config
@ -3,6 +3,11 @@ abandon = group tooz-core
 label-Code-Review = -2..+2 group tooz-core
 label-Workflow = -1..+1 group tooz-core

+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/tags/*"]
 pushSignedTag = group tooz-release