From 404ec57fb3b3fd6a4a30e4891c51f18412e05043 Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Tue, 1 Jul 2014 11:46:51 +0200 Subject: [PATCH] Change ACLs to apply on proposed/* branches Change ACLs so that they would apply to proposed/* branches instead of milestone-proposed branches, and adjust documentation to match. NB: The top-level project.config should also be changed so that its ACLs apply to proposed/* branches. It's apparently not driven by the config repository. Change-Id: Iad6991315b1d526026e0aeb0e968ed85dd317fac --- doc/source/gerrit.rst | 4 ++-- doc/source/jeepyb.rst | 2 +- .../files/gerrit/acls/openstack-dev/heat-cfnclient.config | 2 +- .../files/gerrit/acls/openstack-dev/openstack-nose.config | 2 +- .../files/gerrit/acls/openstack-dev/sandbox.config | 2 +- .../files/gerrit/acls/openstack-infra/tripleo-ci.config | 2 +- .../files/gerrit/acls/openstack/ceilometer.config | 2 +- .../files/gerrit/acls/openstack/cinder.config | 2 +- .../files/gerrit/acls/openstack/designate.config | 2 +- .../files/gerrit/acls/openstack/django_openstack_auth.config | 2 +- .../files/gerrit/acls/openstack/gantt.config | 2 +- .../files/gerrit/acls/openstack/glance.config | 2 +- .../files/gerrit/acls/openstack/heat-cfntools.config | 2 +- .../files/gerrit/acls/openstack/heat-templates.config | 2 +- .../openstack_project/files/gerrit/acls/openstack/heat.config | 2 +- .../files/gerrit/acls/openstack/horizon.config | 2 +- .../files/gerrit/acls/openstack/ironic.config | 2 +- .../files/gerrit/acls/openstack/keystone.config | 2 +- .../files/gerrit/acls/openstack/neutron.config | 2 +- .../openstack_project/files/gerrit/acls/openstack/nova.config | 2 +- .../files/gerrit/acls/openstack/openstack-doc-tools.config | 2 +- .../files/gerrit/acls/openstack/oslo-incubator.config | 2 +- .../files/gerrit/acls/openstack/oslo.config.config | 2 +- .../files/gerrit/acls/openstack/oslo.db.config | 2 +- .../files/gerrit/acls/openstack/oslo.i18n.config | 2 +- .../files/gerrit/acls/openstack/oslo.messaging.config | 2 +- .../files/gerrit/acls/openstack/oslo.rootwrap.config | 2 +- .../files/gerrit/acls/openstack/oslo.version.config | 2 +- .../files/gerrit/acls/openstack/oslosphinx.config | 2 +- .../files/gerrit/acls/openstack/oslotest.config | 2 +- .../files/gerrit/acls/openstack/pycadf.config | 2 +- .../gerrit/acls/openstack/python-ceilometerclient.config | 2 +- .../files/gerrit/acls/openstack/python-cinderclient.config | 2 +- .../files/gerrit/acls/openstack/python-glanceclient.config | 2 +- .../files/gerrit/acls/openstack/python-heatclient.config | 2 +- .../files/gerrit/acls/openstack/python-ironicclient.config | 2 +- .../files/gerrit/acls/openstack/python-keystoneclient.config | 2 +- .../files/gerrit/acls/openstack/python-marconiclient.config | 2 +- .../files/gerrit/acls/openstack/python-neutronclient.config | 2 +- .../files/gerrit/acls/openstack/python-novaclient.config | 2 +- .../files/gerrit/acls/openstack/python-openstackclient.config | 2 +- .../files/gerrit/acls/openstack/python-swiftclient.config | 2 +- .../files/gerrit/acls/openstack/python-troveclient.config | 2 +- .../files/gerrit/acls/openstack/sahara.config | 2 +- .../files/gerrit/acls/openstack/swift-bench.config | 2 +- .../files/gerrit/acls/openstack/swift.config | 2 +- .../files/gerrit/acls/openstack/tempest.config | 2 +- .../files/gerrit/acls/openstack/tripleo-image-elements.config | 2 +- .../files/gerrit/acls/openstack/trove-integration.config | 2 +- .../files/gerrit/acls/openstack/trove.config | 2 +- .../files/gerrit/acls/stackforge/bufunfa.config | 2 +- .../files/gerrit/acls/stackforge/kite.config | 2 +- .../files/gerrit/acls/stackforge/magnetodb.config | 2 +- .../files/gerrit/acls/stackforge/mistral.config | 2 +- .../files/gerrit/acls/stackforge/murano.config | 2 +- .../files/gerrit/acls/stackforge/openvz-nova-driver.config | 2 +- .../files/gerrit/acls/stackforge/python-kiteclient.config | 2 +- 57 files changed, 58 insertions(+), 58 deletions(-) diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst index 9c1cbc565c..c7feb1b747 100644 --- a/doc/source/gerrit.rst +++ b/doc/source/gerrit.rst @@ -201,7 +201,7 @@ High level goals: #. Members of Release Managers (Release Manager and delegates), and $PROJECT-milestone (PTL and release minded people) exclusively can perform full code review (blocking or approving: +/- 2), and submit - changes to be merged on milestone-proposed branches. + changes to be merged on pre-release proposed/* branches. #. Full code review (+/- 2) of API projects (documentation of the API, not implementation of the API) should be available to the -core group of the corresponding implementation project as well as to the @@ -287,7 +287,7 @@ Next, edit `project.config` to look like:: submit = group Continuous Integration Tools submit = group Project Bootstrappers - [access "refs/heads/milestone-proposed"] + [access "refs/heads/proposed/*"] exclusiveGroupPermissions = label-Code-Review label-Workflow label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers diff --git a/doc/source/jeepyb.rst b/doc/source/jeepyb.rst index 520a352c08..3cd58db1e5 100644 --- a/doc/source/jeepyb.rst +++ b/doc/source/jeepyb.rst @@ -91,7 +91,7 @@ a single project you will want to do the following: label-Code-Review = -2..+2 group project-name-core label-Workflow = -1..+1 group project-name-core - [access "refs/heads/milestone-proposed"] + [access "refs/heads/proposed/*"] label-Code-Review = -2..+2 group project-name-milestone label-Workflow = -1..+1 group project-name-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config index c1882d81d2..d0ccffcdc3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config @@ -3,7 +3,7 @@ abandon = group heat-core label-Code-Review = -2..+2 group heat-core label-Workflow = -1..+1 group heat-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group heat-milestone label-Code-Review = -2..+2 group heat-milestone label-Workflow = -1..+1 group heat-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config index 4666341f28..816f6eae09 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config @@ -3,7 +3,7 @@ abandon = group openstack-nose-core label-Code-Review = -2..+2 group openstack-nose-core label-Workflow = -1..+1 group openstack-nose-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group openstack-nose-milestone label-Code-Review = -2..+2 group openstack-nose-milestone label-Workflow = -1..+1 group openstack-nose-milestone 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 3345f28e90..b9d7c7fd74 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config @@ -4,7 +4,7 @@ label-Code-Review = -2..+2 group Registered Users label-Verified = -1..+1 group Third-Party CI label-Workflow = -1..+1 group Registered Users -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group Registered Users label-Code-Review = -2..+2 group Registered Users label-Verified = -1..+1 group Third-Party CI diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config index a40867eba4..ef44c26055 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config @@ -3,7 +3,7 @@ abandon = group toci-core label-Code-Review = -2..+2 group toci-core label-Workflow = -1..+1 group toci-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group toci-core label-Code-Review = -2..+2 group toci-core label-Workflow = -1..+1 group toci-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config b/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config index 9d8c464060..539d5b3ed3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config @@ -3,7 +3,7 @@ abandon = group ceilometer-core label-Code-Review = -2..+2 group ceilometer-core label-Workflow = -1..+1 group ceilometer-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group ceilometer-milestone label-Code-Review = -2..+2 group ceilometer-milestone label-Workflow = -1..+1 group ceilometer-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/cinder.config b/modules/openstack_project/files/gerrit/acls/openstack/cinder.config index 9ce6b08ce6..484651c92a 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/cinder.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/cinder.config @@ -3,7 +3,7 @@ abandon = group cinder-core label-Code-Review = -2..+2 group cinder-core label-Workflow = -1..+1 group cinder-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group cinder-milestone label-Code-Review = -2..+2 group cinder-milestone label-Workflow = -1..+1 group cinder-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/designate.config b/modules/openstack_project/files/gerrit/acls/openstack/designate.config index d8f183f2c3..7f48430b0e 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/designate.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/designate.config @@ -3,7 +3,7 @@ abandon = group designate-core label-Code-Review = -2..+2 group designate-core label-Workflow = -1..+1 group designate-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group designate-milestone create = group designate-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow diff --git a/modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config b/modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config index f83b859d94..97a98410d3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config @@ -3,7 +3,7 @@ abandon = group horizon-core label-Code-Review = -2..+2 group horizon-core label-Workflow = -1..+1 group horizon-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group horizon-milestone label-Code-Review = -2..+2 group horizon-milestone label-Workflow = -1..+1 group horizon-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/gantt.config b/modules/openstack_project/files/gerrit/acls/openstack/gantt.config index e20e5891d0..54ce990cdc 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/gantt.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/gantt.config @@ -3,7 +3,7 @@ abandon = group gantt-core label-Code-Review = -2..+2 group gantt-core label-Workflow = -1..+1 group gantt-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group gantt-milestone label-Code-Review = -2..+2 group gantt-milestone label-Workflow = -1..+1 group gantt-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/glance.config b/modules/openstack_project/files/gerrit/acls/openstack/glance.config index 21dd7451cc..095e61adc0 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/glance.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/glance.config @@ -3,7 +3,7 @@ abandon = group glance-core label-Code-Review = -2..+2 group glance-core label-Workflow = -1..+1 group glance-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group glance-milestone label-Code-Review = -2..+2 group glance-milestone label-Workflow = -1..+1 group glance-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config b/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config index c1882d81d2..d0ccffcdc3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config @@ -3,7 +3,7 @@ abandon = group heat-core label-Code-Review = -2..+2 group heat-core label-Workflow = -1..+1 group heat-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group heat-milestone label-Code-Review = -2..+2 group heat-milestone label-Workflow = -1..+1 group heat-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config b/modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config index 5dbdaa95e6..c7763a6a5e 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config @@ -3,7 +3,7 @@ abandon = group heat-core label-Code-Review = -2..+2 group heat-core label-Workflow = -1..+1 group heat-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group heat-milestone label-Code-Review = -2..+2 group heat-milestone label-Workflow = -1..+1 group heat-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat.config b/modules/openstack_project/files/gerrit/acls/openstack/heat.config index 5dbdaa95e6..c7763a6a5e 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/heat.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/heat.config @@ -3,7 +3,7 @@ abandon = group heat-core label-Code-Review = -2..+2 group heat-core label-Workflow = -1..+1 group heat-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group heat-milestone label-Code-Review = -2..+2 group heat-milestone label-Workflow = -1..+1 group heat-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/horizon.config b/modules/openstack_project/files/gerrit/acls/openstack/horizon.config index 654544c4d1..6877ead43d 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/horizon.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/horizon.config @@ -3,7 +3,7 @@ abandon = group horizon-core label-Code-Review = -2..+2 group horizon-core label-Workflow = -1..+1 group horizon-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group horizon-milestone label-Code-Review = -2..+2 group horizon-milestone label-Workflow = -1..+1 group horizon-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ironic.config b/modules/openstack_project/files/gerrit/acls/openstack/ironic.config index c289c62936..4c309cbd61 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/ironic.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/ironic.config @@ -3,7 +3,7 @@ abandon = group ironic-core label-Code-Review = -2..+2 group ironic-core label-Workflow = -1..+1 group ironic-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group ironic-milestone label-Code-Review = -2..+2 group ironic-milestone label-Workflow = -1..+1 group ironic-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/keystone.config b/modules/openstack_project/files/gerrit/acls/openstack/keystone.config index 6412edd09b..46ef179eb1 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/keystone.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/keystone.config @@ -6,7 +6,7 @@ abandon = group keystone-core label-Code-Review = -2..+2 group keystone-core label-Workflow = -1..+1 group keystone-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group keystone-milestone label-Code-Review = -2..+2 group keystone-milestone label-Workflow = -1..+1 group keystone-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/neutron.config b/modules/openstack_project/files/gerrit/acls/openstack/neutron.config index a78903a6d4..415875f66e 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/neutron.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/neutron.config @@ -3,7 +3,7 @@ abandon = group neutron-core label-Code-Review = -2..+2 group neutron-core label-Workflow = -1..+1 group neutron-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group neutron-milestone label-Code-Review = -2..+2 group neutron-milestone label-Workflow = -1..+1 group neutron-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/nova.config b/modules/openstack_project/files/gerrit/acls/openstack/nova.config index c2d328c9f9..898e450776 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/nova.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/nova.config @@ -3,7 +3,7 @@ abandon = group nova-core label-Code-Review = -2..+2 group nova-core label-Workflow = -1..+1 group nova-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group nova-milestone label-Code-Review = -2..+2 group nova-milestone label-Workflow = -1..+1 group nova-milestone 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 29d96455c5..fac24cc744 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 @@ -3,7 +3,7 @@ abandon = group openstack-doc-core label-Code-Review = -2..+2 group openstack-doc-core label-Workflow = -1..+1 group openstack-doc-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group openstack-doc-core label-Code-Review = -2..+2 group openstack-doc-core label-Workflow = -1..+1 group openstack-doc-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config index bb6b8bcd18..1958dfadec 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config @@ -3,7 +3,7 @@ abandon = group oslo-core label-Code-Review = -2..+2 group oslo-core label-Workflow = -1..+1 group oslo-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config index 8a76a27087..dc196bb0b3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config @@ -3,7 +3,7 @@ abandon = group oslo-core label-Code-Review = -2..+2 group oslo-core label-Workflow = -1..+1 group oslo-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.db.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.db.config index 3a93828e62..3692a61d37 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo.db.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.db.config @@ -3,7 +3,7 @@ abandon = group oslo-db-core label-Code-Review = -2..+2 group oslo-db-core label-Workflow = -1..+1 group oslo-db-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.i18n.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.i18n.config index 78dcb87784..3cf6100765 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo.i18n.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.i18n.config @@ -3,7 +3,7 @@ abandon = group oslo-i18n-core label-Code-Review = -2..+2 group oslo-i18n-core label-Workflow = -1..+1 group oslo-i18n-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config index 951e46331d..81c81f752b 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config @@ -3,7 +3,7 @@ abandon = group oslo-messaging-core label-Code-Review = -2..+2 group oslo-messaging-core label-Workflow = -1..+1 group oslo-messaging-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config index ac331215ab..d0e68aac9c 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config @@ -3,7 +3,7 @@ abandon = group oslo-rootwrap-core label-Code-Review = -2..+2 group oslo-rootwrap-core label-Workflow = -1..+1 group oslo-rootwrap-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-rootwrap-milestone label-Code-Review = -2..+2 group oslo-rootwrap-milestone label-Workflow = -1..+1 group oslo-rootwrap-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config index 8a76a27087..dc196bb0b3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config @@ -3,7 +3,7 @@ abandon = group oslo-core label-Code-Review = -2..+2 group oslo-core label-Workflow = -1..+1 group oslo-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config b/modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config index 8a76a27087..dc196bb0b3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config @@ -3,7 +3,7 @@ abandon = group oslo-core label-Code-Review = -2..+2 group oslo-core label-Workflow = -1..+1 group oslo-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslotest.config b/modules/openstack_project/files/gerrit/acls/openstack/oslotest.config index 8a76a27087..dc196bb0b3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/oslotest.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/oslotest.config @@ -3,7 +3,7 @@ abandon = group oslo-core label-Code-Review = -2..+2 group oslo-core label-Workflow = -1..+1 group oslo-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group oslo-milestone label-Code-Review = -2..+2 group oslo-milestone label-Workflow = -1..+1 group oslo-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/pycadf.config b/modules/openstack_project/files/gerrit/acls/openstack/pycadf.config index 3199b0e3ef..ecbbbcb213 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/pycadf.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/pycadf.config @@ -3,7 +3,7 @@ abandon = group pycadf-core label-Code-Review = -2..+2 group pycadf-core label-Workflow = -1..+1 group pycadf-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group pycadf-milestone label-Code-Review = -2..+2 group pycadf-milestone label-Workflow = -1..+1 group pycadf-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config index 3d04feaada..cad14a4bcd 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config @@ -3,7 +3,7 @@ abandon = group ceilometer-core label-Code-Review = -2..+2 group ceilometer-core label-Workflow = -1..+1 group ceilometer-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group ceilometer-milestone label-Code-Review = -2..+2 group ceilometer-milestone label-Workflow = -1..+1 group ceilometer-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config index be7f0b15af..bef0d3ad81 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config @@ -3,7 +3,7 @@ abandon = group cinder-core label-Code-Review = -2..+2 group cinder-core label-Workflow = -1..+1 group cinder-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group cinder-milestone label-Code-Review = -2..+2 group cinder-milestone label-Workflow = -1..+1 group cinder-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config index 55dc94da02..e69dbba53c 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config @@ -3,7 +3,7 @@ abandon = group glance-core label-Code-Review = -2..+2 group glance-core label-Workflow = -1..+1 group glance-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group glance-milestone label-Code-Review = -2..+2 group glance-milestone label-Workflow = -1..+1 group glance-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config index c1882d81d2..d0ccffcdc3 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config @@ -3,7 +3,7 @@ abandon = group heat-core label-Code-Review = -2..+2 group heat-core label-Workflow = -1..+1 group heat-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group heat-milestone label-Code-Review = -2..+2 group heat-milestone label-Workflow = -1..+1 group heat-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-ironicclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-ironicclient.config index a2806088f1..76bc73a21a 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-ironicclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-ironicclient.config @@ -3,7 +3,7 @@ abandon = group ironic-core label-Code-Review = -2..+2 group ironic-core label-Workflow = -1..+1 group ironic-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group ironic-milestone label-Code-Review = -2..+2 group ironic-milestone label-Workflow = -1..+1 group ironic-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config index e2e3efc79b..4962cf32bc 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config @@ -3,7 +3,7 @@ abandon = group keystone-core label-Code-Review = -2..+2 group keystone-core label-Workflow = -1..+1 group keystone-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group keystone-milestone label-Code-Review = -2..+2 group keystone-milestone label-Workflow = -1..+1 group keystone-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config index 75eb4da1ca..0c9b947526 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config @@ -3,7 +3,7 @@ abandon = group marconi-core label-Code-Review = -2..+2 group marconi-core label-Workflow = -1..+1 group marconi-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group marconi-milestone label-Code-Review = -2..+2 group marconi-milestone label-Workflow = -1..+1 group marconi-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config index 1b98c2e389..b2147d4181 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config @@ -3,7 +3,7 @@ abandon = group neutron-core label-Code-Review = -2..+2 group neutron-core label-Workflow = -1..+1 group neutron-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group neutron-milestone label-Code-Review = -2..+2 group neutron-milestone label-Workflow = -1..+1 group neutron-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config index 27ed566d6e..041b5b4398 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config @@ -3,7 +3,7 @@ abandon = group nova-core label-Code-Review = -2..+2 group nova-core label-Workflow = -1..+1 group nova-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group nova-milestone label-Code-Review = -2..+2 group nova-milestone label-Workflow = -1..+1 group nova-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config index fa196f3148..c3973d7094 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config @@ -3,7 +3,7 @@ abandon = group python-openstackclient-core label-Code-Review = -2..+2 group python-openstackclient-core label-Workflow = -1..+1 group python-openstackclient-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group python-openstackclient-milestone label-Code-Review = -2..+2 group python-openstackclient-milestone label-Workflow = -1..+1 group python-openstackclient-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config index 43d54e6eb5..573a0955e0 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config @@ -6,7 +6,7 @@ abandon = group swift-core label-Code-Review = -2..+2 group swift-core label-Workflow = -1..+1 group swift-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group swift-milestone label-Code-Review = -2..+2 group swift-milestone label-Workflow = -1..+1 group swift-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config index b406cdb548..f38ab40f2e 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config @@ -3,7 +3,7 @@ abandon = group trove-core label-Code-Review = -2..+2 group trove-core label-Workflow = -1..+1 group trove-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group trove-milestone label-Code-Review = -2..+2 group trove-milestone label-Workflow = -1..+1 group trove-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/sahara.config b/modules/openstack_project/files/gerrit/acls/openstack/sahara.config index 3c54bb3f81..9fce4cfdc6 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/sahara.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/sahara.config @@ -4,7 +4,7 @@ create = group sahara-milestone label-Code-Review = -2..+2 group sahara-core label-Workflow = -1..+1 group sahara-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group sahara-milestone label-Code-Review = -2..+2 group sahara-milestone label-Workflow = -1..+1 group sahara-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config b/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config index 43d54e6eb5..573a0955e0 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config @@ -6,7 +6,7 @@ abandon = group swift-core label-Code-Review = -2..+2 group swift-core label-Workflow = -1..+1 group swift-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group swift-milestone label-Code-Review = -2..+2 group swift-milestone label-Workflow = -1..+1 group swift-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift.config b/modules/openstack_project/files/gerrit/acls/openstack/swift.config index 9ea6ee5bbc..0d32f2e759 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/swift.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/swift.config @@ -6,7 +6,7 @@ abandon = group swift-core label-Code-Review = -2..+2 group swift-core label-Workflow = -1..+1 group swift-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group swift-milestone label-Code-Review = -2..+2 group swift-milestone label-Workflow = -1..+1 group swift-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config b/modules/openstack_project/files/gerrit/acls/openstack/tempest.config index 919d9309af..d746f8ca37 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/tempest.config @@ -3,7 +3,7 @@ abandon = group tempest-core label-Code-Review = -2..+2 group tempest-core label-Workflow = -1..+1 group tempest-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group tempest-milestone label-Code-Review = -2..+2 group tempest-milestone label-Workflow = -1..+1 group tempest-milestone 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 9f6897bbe1..a4f418036f 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 @@ -3,7 +3,7 @@ abandon = group diskimage-builder-core label-Code-Review = -2..+2 group diskimage-builder-core label-Workflow = -1..+1 group diskimage-builder-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group diskimage-builder-core label-Code-Review = -2..+2 group diskimage-builder-core label-Workflow = -1..+1 group diskimage-builder-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config b/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config index 1d6f72f300..5b5ef79551 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config @@ -3,7 +3,7 @@ abandon = group trove-core label-Code-Review = -2..+2 group trove-core label-Workflow = -1..+1 group trove-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group trove-milestone label-Code-Review = -2..+2 group trove-milestone label-Workflow = -1..+1 group trove-milestone diff --git a/modules/openstack_project/files/gerrit/acls/openstack/trove.config b/modules/openstack_project/files/gerrit/acls/openstack/trove.config index 1d6f72f300..5b5ef79551 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/trove.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/trove.config @@ -3,7 +3,7 @@ abandon = group trove-core label-Code-Review = -2..+2 group trove-core label-Workflow = -1..+1 group trove-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group trove-milestone label-Code-Review = -2..+2 group trove-milestone label-Workflow = -1..+1 group trove-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/bufunfa.config b/modules/openstack_project/files/gerrit/acls/stackforge/bufunfa.config index 7367850b24..52c0ef9e6e 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/bufunfa.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/bufunfa.config @@ -3,7 +3,7 @@ abandon = group bufunfa-core label-Code-Review = -2..+2 group bufunfa-core label-Workflow = -1..+1 group bufunfa-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group bufunfa-milestone label-Code-Review = -2..+2 group bufunfa-milestone label-Workflow = -1..+1 group bufunfa-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/kite.config b/modules/openstack_project/files/gerrit/acls/stackforge/kite.config index bcc1f2587e..748f3dd323 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/kite.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/kite.config @@ -3,7 +3,7 @@ abandon = group barbican-core label-Code-Review = -2..+2 group barbican-core label-Workflow = -1..+1 group barbican-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group barbican-milestone label-Code-Review = -2..+2 group barbican-milestone label-Workflow = -1..+1 group barbican-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config b/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config index 9a2b1152e0..449d5cfa2d 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config @@ -3,7 +3,7 @@ abandon = group magnetodb-core label-Code-Review = -2..+2 group magnetodb-core label-Workflow = -1..+1 group magnetodb-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group magnetodb-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group magnetodb-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config b/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config index 26bf9e08fb..e1963e44bc 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config @@ -3,7 +3,7 @@ abandon = group mistral-core label-Code-Review = -2..+2 group mistral-core label-Workflow = -1..+1 group mistral-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group mistral-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 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 d815a57c8c..ee37313c18 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/murano.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/murano.config @@ -4,7 +4,7 @@ create = group murano-milestone label-Code-Review = -2..+2 group murano-core label-Workflow = -1..+1 group murano-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group murano-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group murano-milestone diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/openvz-nova-driver.config b/modules/openstack_project/files/gerrit/acls/stackforge/openvz-nova-driver.config index 65900cbc4b..041869adb4 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/openvz-nova-driver.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/openvz-nova-driver.config @@ -3,7 +3,7 @@ abandon = group openvz-nova-driver-core label-Code-Review = -2..+2 group openvz-nova-driver-core label-Workflow = -1..+1 group openvz-nova-driver-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group openvz-nova-driver-core label-Code-Review = -2..+2 group openvz-nova-driver-core label-Workflow = -1..+1 group openvz-nova-driver-core diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-kiteclient.config b/modules/openstack_project/files/gerrit/acls/stackforge/python-kiteclient.config index d2e53a5528..0cac30194e 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/python-kiteclient.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/python-kiteclient.config @@ -3,7 +3,7 @@ abandon = group barbican-core label-Code-Review = -2..+2 group barbican-core label-Workflow = -1..+1 group barbican-core -[access "refs/heads/milestone-proposed"] +[access "refs/heads/proposed/*"] abandon = group barbican-milestone label-Code-Review = -2..+2 group barbican-milestone label-Workflow = -1..+1 group barbican-milestone