From bd2cec54e3337885ed53d57ba9ccd1f08e864a46 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 10 Mar 2020 19:20:50 +0100
Subject: [PATCH] Move openstack/infra-manuals to opendev

The infra-manual is now the OpenDev manual, move it to opendev
namespace.

Remove also the publish job, we can publish now to docs.opendev.org.

Change-Id: I96d95781805826b1060523a3c616a9a2f1dc51dd
---
 .../{openstack => opendev}/infra-manual.config   |  0
 gerrit/projects.yaml                             | 10 +++++-----
 gerritbot/channels.yaml                          |  2 +-
 zuul.d/jobs.yaml                                 | 14 --------------
 zuul.d/projects.yaml                             | 16 ++++++++--------
 zuul/main.yaml                                   |  2 +-
 6 files changed, 15 insertions(+), 29 deletions(-)
 rename gerrit/acls/{openstack => opendev}/infra-manual.config (100%)

diff --git a/gerrit/acls/openstack/infra-manual.config b/gerrit/acls/opendev/infra-manual.config
similarity index 100%
rename from gerrit/acls/openstack/infra-manual.config
rename to gerrit/acls/opendev/infra-manual.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 42c2969733..bcfbef38b8 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -228,6 +228,11 @@
   groups:
     - openstack-ci
   description: Tools to make Grafana dashboards from templates
+- project: opendev/infra-manual
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: OpenDev Manual
 - project: opendev/infra-specs
   use-storyboard: true
   groups:
@@ -3151,11 +3156,6 @@
   description: OpenStack I18n Specifications
 - project: openstack/ideas
   description: The place to propose OpenStack-wide ideas for change
-- project: openstack/infra-manual
-  use-storyboard: true
-  groups:
-    - openstack-ci
-  description: OpenStack Infrastructure User Manual
 - project: openstack/instack
   description: RETIRED. A utility to run diskimage-builder elements in place on
     a running host
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 959f267f44..e05a7b3b71 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -123,6 +123,7 @@ opendev:
     - opendev/git-review
     - opendev/glean
     - opendev/grafyaml
+    - opendev/infra-manual
     - opendev/infra-specs
     - opendev/irc-meetings
     - opendev/jeepyb
@@ -226,7 +227,6 @@ opendev:
     - opendev/zone-opendev.org
     - opendev/zone-zuul-ci.org
     - openstack/diskimage-builder
-    - openstack/infra-manual
     - openstack/project-config
     - ttygroup/boartty
     - ttygroup/gertty
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4c995ee8e9..78cd2dc580 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -297,20 +297,6 @@
         name: afs
         pass-to-parent: true
 
-- job:
-    name: promote-infra-manual
-    parent: promote-tox-docs-special-base
-    description: |
-      Promote infra-manual documents to
-      https://docs.openstack.org/infra/manual
-    allowed-projects:
-      - openstack/infra-manual
-    final: true
-    branches: master
-    vars:
-      download_artifact_job: tox-docs
-      special_publish_directory: "infra/manual"
-
 - job:
     name: promote-service-types-authority
     parent: promote-tox-docs-site-base
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index ef4d0e697a..f194be6374 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -162,6 +162,14 @@
       jobs:
         - tox-cover
 
+- project:
+    name: opendev/infra-manual
+    templates:
+      - build-tox-docs
+    promote:
+      jobs:
+        - opendev-promote-docs
+
 - project:
     name: opendev/infra-specs
     check:
@@ -1850,14 +1858,6 @@
     templates:
       - translation-jobs-master-only
 
-- project:
-    name: openstack/infra-manual
-    templates:
-      - build-tox-docs
-    promote:
-      jobs:
-        - promote-infra-manual
-
 - project:
     name: openstack/instack-undercloud
     templates:
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 1845e01f38..11e42a3569 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -186,6 +186,7 @@
           - opendev/git-review
           - opendev/glean
           - opendev/grafyaml
+          - opendev/infra-manual
           - opendev/infra-specs
           - opendev/irc-meetings
           - opendev/jeepyb
@@ -538,7 +539,6 @@
           - openstack/i18n
           - openstack/i18n-specs
           - openstack/ideas
-          - openstack/infra-manual
           - openstack/instack-undercloud
           - openstack/interop
           - openstack/ironic