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
2014-07-01 11:46:51 +02:00 · 2014-07-01 11:46:51 +02:00 · 404ec57fb3
commit 404ec57fb3
parent 072c926e05
57 changed files with 58 additions and 58 deletions
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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