From 10841d321f403bc7d528e4fe09fdfdb4c715a5dc Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 26 Feb 2018 10:40:16 +0000 Subject: [PATCH] Make combined and correct acls for openstacksdk team The shade and sdk teams have merged, but the original implementation of this in the ACLs was to just make openstacksdk-core include shade-core. os-client-config has also been merged, and requestsexceptions is a deliverable of the team too. Go ahead and collapse them into a single acl file and apply it to all the projects. Also remove the -release team as openstacksdk is release managed. Update the ACL file to match what it should be for a release-managed project, including stable-maint and branch-release teams. Update the description - that wiki page isn't really a thing we care about. Change-Id: I45364a382fbed7bbadbecd29aa6ff051fecdb895 --- gerrit/acls/openstack-infra/shade.config | 13 ------- gerrit/acls/openstack/openstacksdk.config | 35 +++++++++++++++++++ gerrit/acls/openstack/os-client-config.config | 14 -------- .../acls/openstack/python-openstacksdk.config | 14 -------- gerrit/projects.yaml | 6 +++- 5 files changed, 40 insertions(+), 42 deletions(-) delete mode 100644 gerrit/acls/openstack-infra/shade.config create mode 100644 gerrit/acls/openstack/openstacksdk.config delete mode 100644 gerrit/acls/openstack/os-client-config.config delete mode 100644 gerrit/acls/openstack/python-openstacksdk.config diff --git a/gerrit/acls/openstack-infra/shade.config b/gerrit/acls/openstack-infra/shade.config deleted file mode 100644 index 69ead6f638..0000000000 --- a/gerrit/acls/openstack-infra/shade.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group shade-core -label-Code-Review = -2..+2 group shade-core -label-Workflow = -1..+1 group shade-core - -[access "refs/tags/*"] -pushSignedTag = group shade-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/openstacksdk.config b/gerrit/acls/openstack/openstacksdk.config new file mode 100644 index 0000000000..effe87339c --- /dev/null +++ b/gerrit/acls/openstack/openstacksdk.config @@ -0,0 +1,35 @@ +[access "refs/heads/*"] +abandon = group openstacksdk-core +label-Code-Review = -2..+2 group openstacksdk-core +label-Workflow = -1..+1 group openstacksdk-core + +[access "refs/heads/stable/*"] +abandon = group Change Owner +abandon = group Project Bootstrappers +abandon = group openstacksdk-stable-maint +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow +label-Code-Review = -2..+2 group Project Bootstrappers +label-Code-Review = -2..+2 group openstacksdk-stable-maint +label-Code-Review = -1..+1 group Registered Users +label-Workflow = -1..+0 group Change Owner +label-Workflow = -1..+1 group Project Bootstrappers +label-Workflow = -1..+1 group openstacksdk-stable-maint + +[access "refs/heads/stable/queens"] +abandon = group Change Owner +abandon = group Project Bootstrappers +abandon = group openstacksdk-release-branch +exclusiveGroupPermissions = abandon label-Code-Review label-Workflow +label-Code-Review = -2..+2 group Project Bootstrappers +label-Code-Review = -2..+2 group openstacksdk-release-branch +label-Code-Review = -1..+1 group Registered Users +label-Workflow = -1..+0 group Change Owner +label-Workflow = -1..+1 group Project Bootstrappers +label-Workflow = -1..+1 group openstacksdk-release-branch + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/acls/openstack/os-client-config.config b/gerrit/acls/openstack/os-client-config.config deleted file mode 100644 index beaef076ed..0000000000 --- a/gerrit/acls/openstack/os-client-config.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group os-client-config-core -label-Code-Review = -2..+2 group os-client-config-core -label-Workflow = -1..+1 group os-client-config-core - -[access "refs/tags/*"] -pushSignedTag = group library-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/python-openstacksdk.config b/gerrit/acls/openstack/python-openstacksdk.config deleted file mode 100644 index 266e76074e..0000000000 --- a/gerrit/acls/openstack/python-openstacksdk.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group python-openstacksdk-core -label-Code-Review = -2..+2 group python-openstacksdk-core -label-Workflow = -1..+1 group python-openstacksdk-core - -[access "refs/tags/*"] -pushSignedTag = group python-openstacksdk-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index c11b47dfb1..bf20cb000e 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -765,6 +765,7 @@ - project: openstack-infra/requestsexceptions use-storyboard: true description: Find exception classes in the requests library + acl-config: /home/gerrit2/acls/openstack/openstacksdk.config - project: openstack-infra/reviewday use-storyboard: true groups: @@ -776,6 +777,7 @@ - project: openstack-infra/shade use-storyboard: true description: Client library for OpenStack containing Infra business logic + acl-config: /home/gerrit2/acls/openstack/openstacksdk.config groups: - openstack-ci - project: openstack-infra/statusbot @@ -5193,6 +5195,7 @@ description: Volume discovery and local storage management lib - project: openstack/os-client-config description: Unified config handling for client libraries and programs + acl-config: /home/gerrit2/acls/openstack/openstacksdk.config - project: openstack/os-cloud-config description: Configure a cloud acl-config: /home/gerrit2/acls/openstack/retired.config @@ -5792,7 +5795,8 @@ options: - translate - project: openstack/python-openstacksdk - description: 'Unified SDK for OpenStack. See: https://wiki.openstack.org/wiki/UnifiedSDK' + description: Unified SDK for OpenStack + acl-config: /home/gerrit2/acls/openstack/openstacksdk.config - project: openstack/python-opentsdbclient description: A simple REST client to communicate with OpenTSDB (needed for Gnocchi to use OpenTSDB as a backend)