From a1d26ad3c21c4a50285a1bb4410eb12bf376b987 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 5 Oct 2017 10:02:00 -0500
Subject: [PATCH] Stop doing afs prep in docs build jobs

We don't publish docs to AFS in the build jobs, so the step is
unnecessary and also prevents infra projects from using the normal docs
build job.

Doing this means we're not reorganizing the docs, so we can remove
latest/ from the success-url - and we can also remove the
branch-specific variants.

Remove mention of docs build jobs from the
publish-openstack-sphinx-docs-infra project-template. The build jobs are
in openstack-python-jobs.

A followup will come to change that - but for now let's align these.

Change-Id: I123b4d9f3514542d8ece8e9681c5265dc54961dc
---
 playbooks/sphinx-docs/post-infra.yaml |  3 ---
 playbooks/sphinx-docs/post.yaml       |  3 ---
 zuul.d/jobs.yaml                      | 24 +-----------------------
 zuul.d/project-templates.yaml         |  6 ------
 4 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 playbooks/sphinx-docs/post-infra.yaml
 delete mode 100644 playbooks/sphinx-docs/post.yaml

diff --git a/playbooks/sphinx-docs/post-infra.yaml b/playbooks/sphinx-docs/post-infra.yaml
deleted file mode 100644
index 9dfb9fc6..00000000
--- a/playbooks/sphinx-docs/post-infra.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - prepare-infra-docs-for-afs
diff --git a/playbooks/sphinx-docs/post.yaml b/playbooks/sphinx-docs/post.yaml
deleted file mode 100644
index 61a111e9..00000000
--- a/playbooks/sphinx-docs/post.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - prepare-docs-for-afs
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4d9ee163..53eaf144 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -167,8 +167,7 @@
       can be examined if desired, and also validates htaccess files
       using the whereto tool.
     run: playbooks/sphinx-docs/run
-    post-run: playbooks/sphinx-docs/post
-    success-url: html/latest/
+    success-url: html/
     required-projects:
       - name: openstack/requirements
     roles:
@@ -178,26 +177,6 @@
       tox_envlist: venv
       tox_extra_args: -vv python setup.py build_sphinx
 
-- job:
-    name: build-openstack-sphinx-docs
-    branches: stable/queens
-    success-url: html/queens/
-
-- job:
-    name: build-openstack-sphinx-docs
-    branches: stable/pike
-    success-url: html/pike/
-
-- job:
-    name: build-openstack-sphinx-docs
-    branches: stable/ocata
-    success-url: html/ocata/
-
-- job:
-    name: build-openstack-sphinx-docs
-    branches: stable/newton
-    success-url: html/newton/
-
 - job:
     name: build-openstack-infra-sphinx-docs
     parent: tox-docs
@@ -207,7 +186,6 @@
       collects the results into the log directory so that they can be
       examined in their published form after a successful build.
     run: playbooks/sphinx-docs/run
-    post-run: playbooks/sphinx-docs/post-infra
     success-url: html/
     roles:
       - zuul: openstack-infra/zuul-jobs
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index a8542917..4099f8dc 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -8,12 +8,6 @@
 
 - project-template:
     name: publish-openstack-sphinx-docs-infra
-    check:
-      jobs:
-        - build-openstack-infra-sphinx-docs
-    gate:
-      jobs:
-        - build-openstack-infra-sphinx-docs
     post:
       jobs:
         - publish-openstack-sphinx-docs-infra