From f5fade9441057d099f4aa62b739b174b0d82427e Mon Sep 17 00:00:00 2001
From: Wu Wenxiang <wu.wenxiang@99cloud.net>
Date: Sat, 18 Dec 2021 19:20:06 +0800
Subject: [PATCH] Rename skyline/skyline* project to openstack/skyline*

Skyline project is officially part of OpenStack
governance now[1]. As agreed by TC, repo rename needs
to be done after project is approved by TC (which is done
now).

As next step, this commit renames all the Skyline projects repo
from 'skyline/' to 'openstack/' namespace.

Repo renamed are:
- openstack/skyline-apiserver
- openstack/skyline-console

[1] https://review.opendev.org/c/openstack/governance/+/814037

Change-Id: Ic690a639992446cc4d39d4ce343ab2d725321d64
---
 gerrit/acls/{skyline => openstack}/skyline.config |  6 +++---
 gerrit/projects.yaml                              | 12 ++++++------
 zuul/main.yaml                                    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename gerrit/acls/{skyline => openstack}/skyline.config (77%)

diff --git a/gerrit/acls/skyline/skyline.config b/gerrit/acls/openstack/skyline.config
similarity index 77%
rename from gerrit/acls/skyline/skyline.config
rename to gerrit/acls/openstack/skyline.config
index 26f464a507..407cc6d72b 100644
--- a/gerrit/acls/skyline/skyline.config
+++ b/gerrit/acls/openstack/skyline.config
@@ -1,11 +1,11 @@
+[access]
+inheritFrom = openstack/meta-config
+
 [access "refs/heads/*"]
 abandon = group skyline-core
 label-Code-Review = -2..+2 group skyline-core
 label-Workflow = -1..+1 group skyline-core
 
-[access "refs/tags/*"]
-pushSignedTag = group skyline-release
-
 [receive]
 requireChangeId = true
 
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 7c31af5615..af221a1a8a 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -5321,6 +5321,12 @@
   description: RETIRED, Tool for collecting diagnostic snapshot from nodes (logs,
     databases, etc).
   acl-config: /home/gerrit2/acls/openstack/retired.config
+- project: openstack/skyline-apiserver
+  description: A modern dashboard for OpenStack - API server
+  acl-config: /home/gerrit2/acls/openstack/skyline.config
+- project: openstack/skyline-console
+  description: A modern dashboard for OpenStack - UI
+  acl-config: /home/gerrit2/acls/openstack/skyline.config
 - project: openstack/solum
   description: 'An OpenStack project designed to make cloud services easier to consume
     and integrate into your application development process. See: https://wiki.openstack.org/wiki/Solum'
@@ -5874,12 +5880,6 @@
 - project: sardonic/sardonic
   description: A hardware inventory system
   use-storyboard: true
-- project: skyline/skyline-apiserver
-  description: A modern dashboard for OpenStack - API server
-  acl-config: /home/gerrit2/acls/skyline/skyline.config
-- project: skyline/skyline-console
-  description: A modern dashboard for OpenStack - UI
-  acl-config: /home/gerrit2/acls/skyline/skyline.config
 - project: stackforge-attic/cookbook-ceph
   acl-config: /home/gerrit2/acls/opendev/retired.config
 - project: stackforge-attic/cookbook-monasca-agent
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 1f347995da..116f36452f 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -902,6 +902,8 @@
           - openstack/senlin-tempest-plugin
           - openstack/service-types-authority
           - openstack/shade
+          - openstack/skyline-apiserver
+          - openstack/skyline-console
           - openstack/solum
           - openstack/solum-dashboard
           - openstack/solum-specs
@@ -1014,8 +1016,6 @@
           - performa/os-faults
           - performa/shaker
           - sardonic/sardonic
-          - skyline/skyline-apiserver
-          - skyline/skyline-console
           - starlingx/ansible-playbooks
           - starlingx/audit-armada-app
           - starlingx/cert-manager-armada-app