From 98c69f6fa9402a187ca30c29c3140e63a5050a5f Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Fri, 25 Nov 2022 14:30:12 +0100
Subject: [PATCH] Use kolla.config for kolla-ansible in gerrit

The kolla project has decided that it no longer needs to have a
dedicated kolla-ansible-core group that is different from the kolla-core
group. Membership between the two groups has already been synced, so
this change is essentially a no-op, but allows us to only maintain a
single group going forward.

[0] https://meetings.opendev.org/meetings/kolla/2022/kolla.2022-11-23-14.00.log.html

Change-Id: I1dc5e5ed9f93ad40f2089891c63b530994b290f2
---
 gerrit/acls/openstack/kolla-ansible.config | 38 ----------------------
 gerrit/projects.yaml                       |  3 +-
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 gerrit/acls/openstack/kolla-ansible.config

diff --git a/gerrit/acls/openstack/kolla-ansible.config b/gerrit/acls/openstack/kolla-ansible.config
deleted file mode 100644
index b9d86589c2..0000000000
--- a/gerrit/acls/openstack/kolla-ansible.config
+++ /dev/null
@@ -1,38 +0,0 @@
-[access]
-inheritFrom = openstack/meta-config
-
-[access "refs/heads/*"]
-abandon = group kolla-ansible-core
-editHashtags = group kolla-ansible-core
-label-Backport-Candidate = -2..+2 group kolla-ansible-core
-label-Backport-Candidate = -1..+1 group Registered Users
-label-Code-Review = -2..+2 group kolla-ansible-core
-label-Review-Priority = -1..+2 group kolla-ansible-core
-label-Workflow = -1..+1 group kolla-ansible-core
-toggleWipState = group kolla-ansible-core
-
-[label "Backport-Candidate"]
-copyAnyScore = true
-defaultValue = 0
-function = NoBlock
-value = -2 Do Not Backport
-value = -1 Not A Backport Candidate
-value = 0 Backport Review Needed
-value = +1 Proposed Backport
-value = +2 Should Backport
-
-[label "Review-Priority"]
-copyAnyScore = true
-defaultValue = 0
-function = AnyWithBlock
-value = -1 Branch Freeze
-value = 0 No Priority
-value = +1 Important Change
-value = +2 Gate Blocker Fix / Urgent Change
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index b00bbe0c9b..6d290a7890 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -882,7 +882,7 @@
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/ansible-collection-kolla
   description: Ansible collection for OpenStack Kolla
-  acl-config: /home/gerrit2/acls/openstack/kolla-ansible.config
+  acl-config: /home/gerrit2/acls/openstack/kolla.config
 - project: openstack/ansible-collections-openstack
   description: Ansible Modules Collection for using OpenStack
   use-storyboard: true
@@ -3605,6 +3605,7 @@
     operating OpenStack clouds
 - project: openstack/kolla-ansible
   description: Ansible deployment of the Kolla containers
+  acl-config: /home/gerrit2/acls/openstack/kolla.config
   docimpact-group: kolla
 - project: openstack/kolla-cli
   description: RETIRED, CLI supporting kolla-ansible deployment project