diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config deleted file mode 100644 index 139aa42d16..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config +++ /dev/null @@ -1,12 +0,0 @@ -[access "refs/*"] - pushTag = group openstack-ci-admins - create = group openstack-ci-admins -[access "refs/heads/*"] - label-Code-Review = -2..+2 group openstack-ci-admins - label-Approved = +0..+1 group openstack-ci-admins -[project] - state = active -[receive] - requireChangeId = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/melange.config b/modules/openstack_project/files/gerrit/acls/openstack/melange.config deleted file mode 100644 index 959fc0bae4..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/melange.config +++ /dev/null @@ -1,18 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group melange-core - label-Approved = +0..+1 group melange-core -[access "refs/heads/milestone-proposed"] - label-Code-Review = -2..+2 group melange-drivers - label-Approved = +0..+1 group melange-drivers -[access "refs/heads/stable/essex"] - label-Code-Review = -2..+2 group melange-core - label-Code-Review = -1..+1 group Registered Users - label-Approved = +0..+1 group melange-core - exclusiveGroupPermissions = label-Code-Review label-Approved -[project] - state = active -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-melangeclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-melangeclient.config deleted file mode 100644 index 7ca4ad0ac4..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-melangeclient.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group melange-core - label-Approved = +0..+1 group melange-core -[access "refs/heads/milestone-proposed"] - label-Code-Review = -2..+2 group melange-drivers - label-Approved = +0..+1 group melange-drivers -[access "refs/tags/*"] - create = group melange-drivers - pushTag = group melange-drivers -[project] - state = active -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index e30f56bfd9..a46ce7a0a7 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -55,8 +55,6 @@ acl_config: /home/gerrit2/acls/openstack-dev/openstack-nose.config - project: openstack-dev/openstack-qa acl_config: /home/gerrit2/acls/openstack-dev/openstack-qa.config -- project: openstack-dev/pbr - acl_config: /home/gerrit2/acls/openstack-dev/pbr.config - project: openstack-dev/sandbox acl_config: /home/gerrit2/acls/openstack-dev/sandbox.config - project: openstack/api-site @@ -77,8 +75,6 @@ acl_config: /home/gerrit2/acls/openstack/image-api.config - project: openstack/keystone acl_config: /home/gerrit2/acls/openstack/keystone.config -- project: openstack/melange - acl_config: /home/gerrit2/acls/openstack/melange.config - project: openstack/netconn-api acl_config: /home/gerrit2/acls/openstack/netconn-api.config - project: openstack/nova @@ -105,8 +101,6 @@ acl_config: /home/gerrit2/acls/openstack/python-glanceclient.config - project: openstack/python-keystoneclient acl_config: /home/gerrit2/acls/openstack/python-keystoneclient.config -- project: openstack/python-melangeclient - acl_config: /home/gerrit2/acls/openstack/python-melangeclient.config - project: openstack/python-novaclient acl_config: /home/gerrit2/acls/openstack/python-novaclient.config - project: openstack/python-openstackclient