From a2ee99a28c0e2004b562719711bffbc95dff2a36 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 11 Jul 2019 11:21:22 +0100 Subject: [PATCH] Add shared 'oslo', 'oslo-independent' ACL files While a lot of oslo projects have their own core group, not all of them do. Introduce a shared 'oslo.config' file for the latter. We can consider reducing the remaining projects later. Change-Id: I9fbb2db6814026c68849c9823307de4c1bc6a954 Signed-off-by: Stephen Finucane --- ...okiecutter.config => oslo-independent.config} | 0 gerrit/acls/openstack/oslo-specs.config | 11 ----------- .../{oslo.config.config => oslo.config} | 0 gerrit/acls/openstack/oslo.context.config | 16 ---------------- gerrit/acls/openstack/oslo.log.config | 16 ---------------- gerrit/acls/openstack/oslo.serialization.config | 16 ---------------- gerrit/acls/openstack/oslo.utils.config | 16 ---------------- gerrit/acls/openstack/oslotest.config | 16 ---------------- gerrit/projects.yaml | 8 ++++++++ 9 files changed, 8 insertions(+), 91 deletions(-) rename gerrit/acls/openstack/{oslo-cookiecutter.config => oslo-independent.config} (100%) delete mode 100644 gerrit/acls/openstack/oslo-specs.config rename gerrit/acls/openstack/{oslo.config.config => oslo.config} (100%) delete mode 100644 gerrit/acls/openstack/oslo.context.config delete mode 100644 gerrit/acls/openstack/oslo.log.config delete mode 100644 gerrit/acls/openstack/oslo.serialization.config delete mode 100644 gerrit/acls/openstack/oslo.utils.config delete mode 100644 gerrit/acls/openstack/oslotest.config diff --git a/gerrit/acls/openstack/oslo-cookiecutter.config b/gerrit/acls/openstack/oslo-independent.config similarity index 100% rename from gerrit/acls/openstack/oslo-cookiecutter.config rename to gerrit/acls/openstack/oslo-independent.config diff --git a/gerrit/acls/openstack/oslo-specs.config b/gerrit/acls/openstack/oslo-specs.config deleted file mode 100644 index c8990d60e4..0000000000 --- a/gerrit/acls/openstack/oslo-specs.config +++ /dev/null @@ -1,11 +0,0 @@ -[access "refs/heads/*"] -abandon = group oslo-core -label-Code-Review = -2..+2 group oslo-core -label-Workflow = -1..+1 group oslo-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/oslo.config.config b/gerrit/acls/openstack/oslo.config similarity index 100% rename from gerrit/acls/openstack/oslo.config.config rename to gerrit/acls/openstack/oslo.config diff --git a/gerrit/acls/openstack/oslo.context.config b/gerrit/acls/openstack/oslo.context.config deleted file mode 100644 index f530cb9b79..0000000000 --- a/gerrit/acls/openstack/oslo.context.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] -abandon = group oslo-core -label-Code-Review = -2..+2 group oslo-core -label-Workflow = -1..+1 group oslo-core - -[access "refs/heads/stable/*"] -abandon = group stable-maint-core -label-Code-Review = -2..+2 group stable-maint-core -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/oslo.log.config b/gerrit/acls/openstack/oslo.log.config deleted file mode 100644 index f530cb9b79..0000000000 --- a/gerrit/acls/openstack/oslo.log.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] -abandon = group oslo-core -label-Code-Review = -2..+2 group oslo-core -label-Workflow = -1..+1 group oslo-core - -[access "refs/heads/stable/*"] -abandon = group stable-maint-core -label-Code-Review = -2..+2 group stable-maint-core -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/oslo.serialization.config b/gerrit/acls/openstack/oslo.serialization.config deleted file mode 100644 index f530cb9b79..0000000000 --- a/gerrit/acls/openstack/oslo.serialization.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] -abandon = group oslo-core -label-Code-Review = -2..+2 group oslo-core -label-Workflow = -1..+1 group oslo-core - -[access "refs/heads/stable/*"] -abandon = group stable-maint-core -label-Code-Review = -2..+2 group stable-maint-core -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/oslo.utils.config b/gerrit/acls/openstack/oslo.utils.config deleted file mode 100644 index f530cb9b79..0000000000 --- a/gerrit/acls/openstack/oslo.utils.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] -abandon = group oslo-core -label-Code-Review = -2..+2 group oslo-core -label-Workflow = -1..+1 group oslo-core - -[access "refs/heads/stable/*"] -abandon = group stable-maint-core -label-Code-Review = -2..+2 group stable-maint-core -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/oslotest.config b/gerrit/acls/openstack/oslotest.config deleted file mode 100644 index f530cb9b79..0000000000 --- a/gerrit/acls/openstack/oslotest.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] -abandon = group oslo-core -label-Code-Review = -2..+2 group oslo-core -label-Workflow = -1..+1 group oslo-core - -[access "refs/heads/stable/*"] -abandon = group stable-maint-core -label-Code-Review = -2..+2 group stable-maint-core -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 7b61a3dc11..ddaedd9347 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -4245,6 +4245,7 @@ - placement - project: openstack/oslo-cookiecutter description: Cookiecutter Template for new Oslo libraries + acl-config: /home/gerrit2/acls/openstack/oslo-independent.config - project: openstack/oslo-incubator description: RETIRED, Part of OpenStack's Oslo project. New Oslo APIs go through an incubation phase in this repository before being released as part of a proper @@ -4252,6 +4253,7 @@ acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/oslo-specs description: OpenStack Oslo Specifications + acl-config: /home/gerrit2/acls/openstack/oslo-independent.config - project: openstack/oslo.cache description: An oslo.config enabled dogpile.cache. options: @@ -4262,8 +4264,10 @@ - translate - project: openstack/oslo.config description: OpenStack library for config + acl-config: /home/gerrit2/acls/openstack/oslo.config - project: openstack/oslo.context description: OpenStack Context library + acl-config: /home/gerrit2/acls/openstack/oslo.config - project: openstack/oslo.db description: OpenStack Common DB Code options: @@ -4278,6 +4282,7 @@ - translate - project: openstack/oslo.log description: Logging library. + acl-config: /home/gerrit2/acls/openstack/oslo.config options: - translate - project: openstack/oslo.messaging @@ -4306,6 +4311,7 @@ description: OpenStack library for rootwrap - project: openstack/oslo.serialization description: OpenStack library for serialization + acl-config: /home/gerrit2/acls/openstack/oslo.config - project: openstack/oslo.service description: Library for running OpenStack services options: @@ -4316,6 +4322,7 @@ description: Common code for writing OpenStack upgrade checks. - project: openstack/oslo.utils description: OpenStack library utils + acl-config: /home/gerrit2/acls/openstack/oslo.config options: - translate - project: openstack/oslo.versionedobjects @@ -4331,6 +4338,7 @@ acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/oslotest description: OpenStack test classes + acl-config: /home/gerrit2/acls/openstack/oslo.config - project: openstack/osprofiler description: OpenStack cross service/project profiler - project: openstack/ossa