From 85294041b121e803fa3ebac696541ccb13eb0a0c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 27 Nov 2023 21:27:15 +0900
Subject: [PATCH] Move os-(apply|collect|refresh)-config to heat

These projects have been transferred from tripleo to heat[1].

Also replace the os-apply-config group because the group contains only
TripleO cores.

[1] 55873c8fcb825611d17b60e61f1c66d2981e39b3

Change-Id: I61fd9b16f56d09bbc62cb1d602cfd927cd002a43
---
 gerrit/acls/openstack/os-apply-config.config | 14 --------------
 gerrit/projects.yaml                         |  7 ++++---
 gerritbot/channels.yaml                      |  6 +++---
 zuul.d/projects.yaml                         |  6 +++---
 4 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 gerrit/acls/openstack/os-apply-config.config

diff --git a/gerrit/acls/openstack/os-apply-config.config b/gerrit/acls/openstack/os-apply-config.config
deleted file mode 100644
index 89bc7d1f36..0000000000
--- a/gerrit/acls/openstack/os-apply-config.config
+++ /dev/null
@@ -1,14 +0,0 @@
-[access]
-	inheritFrom = openstack/meta-config
-
-[access "refs/heads/*"]
-	abandon = group os-apply-config-core
-	label-Code-Review = -2..+2 group os-apply-config-core
-	label-Workflow = -1..+1 group os-apply-config-core
-
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-
-[submit]
-	mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 08cf37546b..23dbd30fe2 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -4722,6 +4722,7 @@
   description: Sphinx extension to support OpenStack API reference pages creation
 - project: openstack/os-apply-config
   description: Apply configuration from cloud metadata.
+  acl-config: /home/gerrit2/acls/openstack/heat.config
 - project: openstack/os-brick
   description: Volume discovery and local storage management lib
   acl-config: /home/gerrit2/acls/openstack/cinder.config
@@ -4735,7 +4736,7 @@
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/os-collect-config
   description: Collect and cache metadata, run hooks on changes.
-  acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
+  acl-config: /home/gerrit2/acls/openstack/heat.config
 - project: openstack/os-ken
   description: A component-based software defined networking framework for OpenStack.
   groups:
@@ -4746,12 +4747,12 @@
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/os-net-config
   description: Host network configuration tool
-  acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
+  acl-config: /home/gerrit2/acls/openstack/tripleo.config
 - project: openstack/os-performance-tools
   description: Python scripts for use in Performance QA work
 - project: openstack/os-refresh-config
   description: Restart services and coordinate data migration on Heat config changes.
-  acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
+  acl-config: /home/gerrit2/acls/openstack/heat.config
 - project: openstack/os-resource-classes
   description: A library containing standardized resource class names in the Placement
     service.
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index d3a0044b4b..c47a8c71cf 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -45,6 +45,9 @@ heat:
     - openstack/heat-specs
     - openstack/heat-tempest-plugin
     - openstack/heat-templates
+    - openstack/os-apply-config
+    - openstack/os-collect-config
+    - openstack/os-refresh-config
     - openstack/python-heatclient
   branches:
     - master
@@ -1814,10 +1817,7 @@ tripleo:
     - openstack/instack-undercloud
     - openstack/openstack-tempest-skiplist
     - openstack/openstack-virtual-baremetal
-    - openstack/os-apply-config
-    - openstack/os-collect-config
     - openstack/os-net-config
-    - openstack/os-refresh-config
     - openstack/paunch
     - openstack/puppet-pacemaker
     - openstack/puppet-tripleo
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 002e70a72a..eff8c42c27 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -3476,7 +3476,7 @@
 
 - project:
     name: openstack/os-apply-config
-    queue: tripleo
+    queue: heat
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
@@ -3495,7 +3495,7 @@
 
 - project:
     name: openstack/os-collect-config
-    queue: tripleo
+    queue: heat
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
@@ -3521,7 +3521,7 @@
 
 - project:
     name: openstack/os-refresh-config
-    queue: tripleo
+    queue: heat
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi