diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack-vagrant.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack-vagrant.config index 07f9c899af..4833e68966 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack-vagrant.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack-vagrant.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group devstack-core [access "refs/heads/stable/*"] abandon = group devstack-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group devstack-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group devstack-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config index 4133927e17..90752be452 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group devstack-core [access "refs/heads/stable/*"] abandon = group devstack-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group devstack-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group devstack-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config index 74f3e4b5f9..a5d5705412 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group grenade-core [access "refs/heads/stable/*"] abandon = group grenade-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group grenade-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group grenade-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/api-site.config b/modules/openstack_project/files/gerrit/acls/openstack/api-site.config index d48a54e407..47bfdca095 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/api-site.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/api-site.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group openstack-doc-core [access "refs/heads/stable/*"] abandon = group openstack-doc-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group openstack-doc-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group openstack-doc-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/designate.config b/modules/openstack_project/files/gerrit/acls/openstack/designate.config index 93d26d975c..d8f183f2c3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/designate.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/designate.config @@ -6,7 +6,7 @@ label-Workflow = -1..+1 group designate-core [access "refs/heads/milestone-proposed"] abandon = group designate-milestone create = group designate-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group designate-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group designate-milestone @@ -14,7 +14,7 @@ label-Workflow = -1..+1 group designate-milestone [access "refs/heads/stable/*"] abandon = group designate-milestone create = group designate-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group designate-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group designate-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/governance.config b/modules/openstack_project/files/gerrit/acls/openstack/governance.config index b1b0e8c3c4..991ca0fc22 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/governance.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/governance.config @@ -1,6 +1,6 @@ [access "refs/heads/*"] abandon = group tech-committee-chair -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -1..+1 group tech-committee label-Code-Review = -1..+2 group tech-committee-chair label-Workflow = -1..+1 group tech-committee-chair diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config index 4ee618aaec..29d96455c5 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config @@ -10,7 +10,7 @@ label-Workflow = -1..+1 group openstack-doc-core [access "refs/heads/stable/*"] abandon = group openstack-doc-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group openstack-doc-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group openstack-doc-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config index d48a54e407..47bfdca095 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group openstack-doc-core [access "refs/heads/stable/*"] abandon = group openstack-doc-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group openstack-doc-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group openstack-doc-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack.config index c125c0a6ae..f9a4d406d2 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/openstack.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack.config @@ -4,14 +4,14 @@ push = group Release Managers [access "refs/heads/*"] abandon = group Release Managers -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group Release Managers label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group Release Managers [access "refs/heads/stable/*"] abandon = group Release Managers -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group Release Managers label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group Release Managers diff --git a/modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config b/modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config index 599cf449a3..4932893bec 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config @@ -8,7 +8,7 @@ label-Workflow = -1..+1 group openstack-doc-core [access "refs/heads/stable/*"] abandon = group openstack-doc-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group openstack-doc-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group openstack-doc-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/sahara.config b/modules/openstack_project/files/gerrit/acls/openstack/sahara.config index 6262ebd084..3c54bb3f81 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/sahara.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/sahara.config @@ -11,7 +11,7 @@ label-Workflow = -1..+1 group sahara-milestone [access "refs/heads/stable/*"] abandon = group sahara-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group sahara-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group sahara-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/taskflow.config b/modules/openstack_project/files/gerrit/acls/openstack/taskflow.config index 73c54f0819..de5e185621 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/taskflow.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/taskflow.config @@ -8,7 +8,7 @@ label-Workflow = -1..+1 group taskflow-core [access "refs/heads/stable/*"] abandon = group taskflow-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group taskflow-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group taskflow-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config b/modules/openstack_project/files/gerrit/acls/openstack/tempest.config index 456928569b..919d9309af 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/tempest.config @@ -10,7 +10,7 @@ label-Workflow = -1..+1 group tempest-milestone [access "refs/heads/stable/*"] abandon = group tempest-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group tempest-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group tempest-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-heat-templates.config b/modules/openstack_project/files/gerrit/acls/openstack/tripleo-heat-templates.config index a049405805..c987458dbb 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-heat-templates.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/tripleo-heat-templates.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group diskimage-builder-core [access "refs/heads/stable/*"] abandon = group tripleo-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group tripleo-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group tripleo-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-image-elements.config b/modules/openstack_project/files/gerrit/acls/openstack/tripleo-image-elements.config index e38ad65e30..9f6897bbe1 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-image-elements.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/tripleo-image-elements.config @@ -10,7 +10,7 @@ label-Workflow = -1..+1 group diskimage-builder-core [access "refs/heads/stable/*"] abandon = group tripleo-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group tripleo-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group tripleo-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-incubator.config b/modules/openstack_project/files/gerrit/acls/openstack/tripleo-incubator.config index e2f5155308..10ac9cedff 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-incubator.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/tripleo-incubator.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group tripleo-core [access "refs/heads/stable/*"] abandon = group tripleo-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group tripleo-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group tripleo-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config b/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config index 649e8b3b07..32788de78b 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group tripleo-core [access "refs/heads/stable/*"] abandon = group tripleo-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group tripleo-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group tripleo-core diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/anvil.config b/modules/openstack_project/files/gerrit/acls/stackforge/anvil.config index a874946919..0af5fafb45 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/anvil.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/anvil.config @@ -8,7 +8,7 @@ label-Workflow = -1..+1 group anvil-core [access "refs/heads/stable/*"] abandon = group anvil-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group anvil-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group anvil-core diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/chef-cookbooks.config b/modules/openstack_project/files/gerrit/acls/stackforge/chef-cookbooks.config index 3aa1b4b442..8da351897e 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/chef-cookbooks.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/chef-cookbooks.config @@ -8,7 +8,7 @@ label-Workflow = -1..+1 group chef-manager-core [access "refs/heads/stable/*"] abandon = group chef-manager-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group chef-manager-core label-Workflow = -1..+1 group chef-manager-core diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config b/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config index 0666c15c70..9a2b1152e0 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config @@ -5,14 +5,14 @@ label-Workflow = -1..+1 group magnetodb-core [access "refs/heads/milestone-proposed"] abandon = group magnetodb-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group magnetodb-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group magnetodb-milestone [access "refs/heads/stable/*"] abandon = group magnetodb-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group magnetodb-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group magnetodb-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/manila.config b/modules/openstack_project/files/gerrit/acls/stackforge/manila.config index 9ee948e40d..499ca07458 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/manila.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/manila.config @@ -8,7 +8,7 @@ label-Workflow = -1..+1 group manila-core [access "refs/heads/stable/*"] abandon = group manila-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group manila-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group manila-core diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config b/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config index 84bdee4a6e..26bf9e08fb 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config @@ -5,21 +5,21 @@ label-Workflow = -1..+1 group mistral-core [access "refs/heads/milestone-proposed"] abandon = group mistral-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group mistral-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group mistral-milestone [access "refs/heads/release-*"] abandon = group mistral-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group mistral-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group mistral-milestone [access "refs/heads/stable/*"] abandon = group mistral-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group mistral-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group mistral-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/murano.config b/modules/openstack_project/files/gerrit/acls/stackforge/murano.config index 18e8fb3440..d815a57c8c 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/murano.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/murano.config @@ -6,21 +6,21 @@ label-Workflow = -1..+1 group murano-core [access "refs/heads/milestone-proposed"] abandon = group murano-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group murano-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group murano-milestone [access "refs/heads/release-*"] abandon = group murano-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group murano-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group murano-milestone [access "refs/heads/stable/*"] abandon = group murano-milestone -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group murano-milestone label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group murano-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/puppet-modules.config b/modules/openstack_project/files/gerrit/acls/stackforge/puppet-modules.config index 782c426b45..ff981f641e 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/puppet-modules.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/puppet-modules.config @@ -8,7 +8,7 @@ label-Workflow = -1..+1 group puppet-manager-core [access "refs/heads/stable/*"] abandon = group puppet-manager-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group puppet-manager-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group puppet-manager-core diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config b/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config index d140504731..6798466ace 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config @@ -5,7 +5,7 @@ label-Workflow = -1..+1 group sahara-guestagent-core [access "refs/heads/stable/*"] abandon = group sahara-guestagent-core -exclusiveGroupPermissions = label-Code-Review label-Workflow abandon +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group sahara-guestagent-core label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+1 group sahara-guestagent-core