From 305b58683e705c999b51c495506dc24e746ae041 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Wed, 28 Oct 2020 17:33:19 +0100 Subject: [PATCH] Create telemetry group and include aodh ceilometer panko telemetry-specs Also rename the storyboard group to telemetry Change-Id: I0028cac15313a5642f0db51cd82bf1bbd1d2021d --- gerrit/acls/openstack/ceilometer.config | 26 ----------------- gerrit/acls/openstack/panko.config | 26 ----------------- gerrit/acls/openstack/telemetry-specs.config | 11 -------- .../{aodh.config => telemetry.config} | 12 ++++---- gerrit/projects.yaml | 28 +++++++++++-------- 5 files changed, 22 insertions(+), 81 deletions(-) delete mode 100644 gerrit/acls/openstack/ceilometer.config delete mode 100644 gerrit/acls/openstack/panko.config delete mode 100644 gerrit/acls/openstack/telemetry-specs.config rename gerrit/acls/openstack/{aodh.config => telemetry.config} (69%) diff --git a/gerrit/acls/openstack/ceilometer.config b/gerrit/acls/openstack/ceilometer.config deleted file mode 100644 index 2f3f251941..0000000000 --- a/gerrit/acls/openstack/ceilometer.config +++ /dev/null @@ -1,26 +0,0 @@ -[access "refs/heads/*"] -abandon = group ceilometer-core -label-Code-Review = -2..+2 group ceilometer-core -label-Workflow = -1..+1 group ceilometer-core - -[access "refs/heads/stable/*"] -abandon = group Change Owner -abandon = group Project Bootstrappers -abandon = group ceilometer-stable-maint -abandon = group stable-maint-core -exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group ceilometer-stable-maint -label-Code-Review = -2..+2 group stable-maint-core -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 ceilometer-stable-maint -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/panko.config b/gerrit/acls/openstack/panko.config deleted file mode 100644 index 1591f2e693..0000000000 --- a/gerrit/acls/openstack/panko.config +++ /dev/null @@ -1,26 +0,0 @@ -[access "refs/heads/*"] -abandon = group panko-core -label-Code-Review = -2..+2 group panko-core -label-Workflow = -1..+1 group panko-core - -[access "refs/heads/stable/*"] -abandon = group Change Owner -abandon = group Project Bootstrappers -abandon = group panko-stable-maint -abandon = group stable-maint-core -exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group panko-stable-maint -label-Code-Review = -2..+2 group stable-maint-core -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 panko-stable-maint -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/telemetry-specs.config b/gerrit/acls/openstack/telemetry-specs.config deleted file mode 100644 index f44069b591..0000000000 --- a/gerrit/acls/openstack/telemetry-specs.config +++ /dev/null @@ -1,11 +0,0 @@ -[access "refs/heads/*"] -abandon = group ceilometer-core -label-Code-Review = -2..+2 group ceilometer-core -label-Workflow = -1..+1 group ceilometer-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/aodh.config b/gerrit/acls/openstack/telemetry.config similarity index 69% rename from gerrit/acls/openstack/aodh.config rename to gerrit/acls/openstack/telemetry.config index 513b5dced0..7e7734780f 100644 --- a/gerrit/acls/openstack/aodh.config +++ b/gerrit/acls/openstack/telemetry.config @@ -1,22 +1,22 @@ [access "refs/heads/*"] -abandon = group aodh-core -label-Code-Review = -2..+2 group aodh-core -label-Workflow = -1..+1 group aodh-core +abandon = group telemetry-core +label-Code-Review = -2..+2 group telemetry-core +label-Workflow = -1..+1 group telemetry-core [access "refs/heads/stable/*"] abandon = group Change Owner abandon = group Project Bootstrappers -abandon = group aodh-stable-maint abandon = group stable-maint-core +abandon = group telemetry-stable-maint exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group aodh-stable-maint label-Code-Review = -2..+2 group stable-maint-core +label-Code-Review = -2..+2 group telemetry-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 aodh-stable-maint label-Workflow = -1..+1 group stable-maint-core +label-Workflow = -1..+1 group telemetry-stable-maint [receive] requireChangeId = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 95f316dc07..fc23e36093 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -1030,9 +1030,10 @@ description: OpenStack Telemetry (Ceilometer) Alarming use-storyboard: true groups: - - ceilometer + - telemetry options: - translate + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/api-sig description: OpenStack API Special Interest Group use-storyboard: true @@ -1152,17 +1153,18 @@ description: OpenStack Telemetry (Ceilometer) use-storyboard: true groups: - - ceilometer + - telemetry options: - translate + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/ceilometer-powervm description: PowerVM compute agent plugins for OpenStack Ceilometer - project: openstack/ceilometermiddleware description: OpenStack Telemetry (Ceilometer) Middleware use-storyboard: true groups: - - ceilometer - acl-config: /home/gerrit2/acls/openstack/ceilometer.config + - telemetry + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/charm-aodh description: Juju Charm - Aodh acl-config: /home/gerrit2/acls/openstack/charm.config @@ -4455,9 +4457,10 @@ description: Event storage and REST API for Ceilometer use-storyboard: true groups: - - ceilometer + - telemetry options: - translate + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/patrole description: Tempest plugin for testing and verifying RBAC policy enforcement. use-storyboard: true @@ -4667,8 +4670,8 @@ description: Client library for Aodh API use-storyboard: true groups: - - ceilometer - acl-config: /home/gerrit2/acls/openstack/aodh.config + - telemetry + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/python-appcatalogclient description: RETIRED, Client library for App Catalog API acl-config: /home/gerrit2/acls/openstack/retired.config @@ -4823,10 +4826,10 @@ - openstackclient - project: openstack/python-pankoclient description: Client library for Panko API - acl-config: /home/gerrit2/acls/openstack/panko.config use-storyboard: true groups: - - ceilometer + - telemetry + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/python-qinlingclient use-storyboard: true description: Python client for Qinling REST API. @@ -5244,14 +5247,15 @@ - project: openstack/telemetry-specs use-storyboard: true groups: - - ceilometer + - telemetry description: OpenStack Telemetry Specifications + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/telemetry-tempest-plugin description: Tempest Plugin for Telemetry projects use-storyboard: true groups: - - ceilometer - acl-config: /home/gerrit2/acls/openstack/ceilometer.config + - telemetry + acl-config: /home/gerrit2/acls/openstack/telemetry.config - project: openstack/tempest description: OpenStack Testing (Tempest) of an existing cloud - project: openstack/tempest-horizon