From b84932a27b82016b553fff09427b4d98cc73e209 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Thu, 23 Apr 2020 18:56:56 +0100
Subject: [PATCH] Add tripleo-ci-shared-core group

Adds new group tripleo-ci-shared-core group which will include
tripleo-core and be used to grant access to other collaborators to
specific list of repositories which contain shared code.

Once the new group is created, I will add tripleo-core as a subgroup
and the members from the retired openstack-tempest-skiplist group.

The purpose of this group is to ease ACL maintenance by re-using
it among several similar projects.

Change-Id: I52de44bca33d8faea10fa403e53959a194ff2889
---
 .../acls/openstack/openstack-tempest-skiplist.config | 11 -----------
 gerrit/acls/openstack/tripleo-ci-shared-core.config  | 12 ++++++++++++
 gerrit/projects.yaml                                 |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 gerrit/acls/openstack/openstack-tempest-skiplist.config
 create mode 100644 gerrit/acls/openstack/tripleo-ci-shared-core.config

diff --git a/gerrit/acls/openstack/openstack-tempest-skiplist.config b/gerrit/acls/openstack/openstack-tempest-skiplist.config
deleted file mode 100644
index df8de6f041..0000000000
--- a/gerrit/acls/openstack/openstack-tempest-skiplist.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[access "refs/heads/*"]
-abandon = group openstack-tempest-skiplist-core
-label-Code-Review = -2..+2 group openstack-tempest-skiplist-core
-label-Workflow = -1..+1 group openstack-tempest-skiplist-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack/tripleo-ci-shared-core.config b/gerrit/acls/openstack/tripleo-ci-shared-core.config
new file mode 100644
index 0000000000..0bab55139f
--- /dev/null
+++ b/gerrit/acls/openstack/tripleo-ci-shared-core.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+abandon = group tripleo-ci-shared-core
+label-Code-Review = -2..+2 group tripleo-ci-shared-core
+label-Verified = -1..+1 group tripleo-ci
+label-Workflow = -1..+1 group tripleo-ci-shared-core
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 5914762dc7..da99337fbe 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -861,7 +861,7 @@
     - tripleo
 - project: openstack/ansible-role-collect-logs
   description: An Ansible role for aggregating logs from different nodes.
-  acl-config: /home/gerrit2/acls/openstack/tripleo.config
+  acl-config: /home/gerrit2/acls/openstack/tripleo-ci-shared-core.config
   groups:
     - tripleo
 - project: openstack/ansible-role-container-registry
@@ -4174,6 +4174,7 @@
 - project: openstack/openstack-tempest-skiplist
   description: A collection of tempest skipped tests shared across OpenStack projects.
   use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/tripleo-ci-shared-core.config
 - project: openstack/openstack-ux
   description: OpenStack User Experience Repository
 - project: openstack/openstack-virtual-baremetal