From d7f103f96401010cc3f60d2987ea5de51eb2ff43 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 7 Oct 2018 10:28:19 +0200
Subject: [PATCH] Use tox-docs for governance-tc publishing

Publish using tox-docs instead of using sphinx directly.

Change-Id: If409fc54eb6777e63e3998e513ff1120d23cefca
Depends-On: https://review.openstack.org/608442
---
 playbooks/publish/static-tox-docs.yaml | 12 ++++++++++++
 zuul.d/jobs.yaml                       | 25 +++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 playbooks/publish/static-tox-docs.yaml

diff --git a/playbooks/publish/static-tox-docs.yaml b/playbooks/publish/static-tox-docs.yaml
new file mode 100644
index 0000000000..c39284b9c0
--- /dev/null
+++ b/playbooks/publish/static-tox-docs.yaml
@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+    - add-fileserver
+
+- hosts: "{{ fileserver.fqdn }}"
+  gather_facts: False
+  tasks:
+    - name: Upload docs to static site
+      synchronize:
+        src: "{{ zuul.executor.work_root }}/artifacts/"
+        dest: "{{ fileserver.path }}/{{ static_target }}/"
+      when: zuul_success | bool
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0d61e549d5..63bcdba02e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -652,6 +652,28 @@
       - name: fileserver
         secret: eavesdrop_ssh_key
 
+- job:
+    name: base-publish-tox-docs-static
+    abstract: true
+    protected: true
+    description: |
+      Base job for jobs that publish content to static.openstack.org.
+
+      Jobs need to set the variable ``static_target`` for site to
+      publish to.
+      This job uses ``tox -e docs`` for building documents.
+    pre-run: playbooks/project-config/pre-tox.yaml
+    run: playbooks/project-config/run-tox.yaml
+    post-run:
+      - playbooks/sphinx/post-direct.yaml
+      - playbooks/project-config/post-tox.yaml
+      - playbooks/publish/static-tox-docs.yaml
+    vars:
+      tox_envlist: docs
+    secrets:
+      - name: fileserver
+        secret: static_ssh_key
+
 - job:
     name: base-publish-static
     abstract: true
@@ -692,7 +714,7 @@
 
 - job:
     name: publish-governance-tc
-    parent: base-publish-static
+    parent: base-publish-tox-docs-static
     description: |
       Publish content to static.openstack.org to /srv/static/tc
     final: true
@@ -700,7 +722,6 @@
       - openstack/governance
     vars:
       static_target: tc
-      sphinx_python: python3
 
 - job:
     name: publish-governance-uc