From 348ea5a866feaf577a0eab2585e846e6736ca86f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 20 Aug 2018 07:13:37 +0200
Subject: [PATCH] Switch infra docs job to new PTI

Create new infra publish templates to use jobs that use "tox -e docs"
directly. These will replace publish-openstack-sphinx-docs-infra etc.

Use new template publish-tox-docs-infra directly for this repo.

Depends-On: https://review.openstack.org/593488
Change-Id: I47ac73d271d6349ec210b7423a8588cc864c0c94
---
 zuul.d/project-templates.yaml | 34 ++++++++++++++++++++++++++++++++++
 zuul.d/project.yaml           |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index dcbda27a..de3607ba 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -111,6 +111,8 @@
     description: |
       Runs normal OpenStack PTI build jobs and publishes to the Infra
       docs location.
+
+      This template is obsolete, use publish-openstack-tox-docs-infra instead.
     check:
       jobs:
         - build-sphinx-docs
@@ -121,11 +123,28 @@
       jobs:
         - publish-openstack-sphinx-docs-infra
 
+- project-template:
+    name: publish-tox-docs-infra
+    description: |
+      Runs normal OpenStack PTI build jobs and publishes to the Infra
+      docs location.
+    check:
+      jobs:
+        - tox-docs
+    gate:
+      jobs:
+        - tox-docs
+    post:
+      jobs:
+        - publish-tox-docs-infra
+
 - project-template:
     name: release-openstack-sphinx-docs-infra
     description: |
       Runs normal OpenStack PTI build jobs and publishes to the Infra
       docs location only on tagged releases.
+
+      This template is obsolete, use release-tox-docs-infra instead.
     check:
       jobs:
         - build-sphinx-docs
@@ -136,6 +155,21 @@
       jobs:
         - publish-openstack-sphinx-docs-infra
 
+- project-template:
+    name: release-tox-docs-infra
+    description: |
+      Runs normal OpenStack PTI build jobs and publishes to the Infra
+      docs location only on tagged releases.
+    check:
+      jobs:
+        - tox-docs
+    gate:
+      jobs:
+        - tox-docs
+    release:
+      jobs:
+        - publish-tox-docs-infra
+
 - project-template:
     name: puppet-release-jobs
     check:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1227d3ed..45fe3839 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,7 +1,7 @@
 # Project pipeline definition for openstack-zuul-jobs
 - project:
     templates:
-      - publish-openstack-sphinx-docs-infra
+      - publish-tox-docs-infra
     check:
       jobs:
         - openstack-infra-base-integration-centos-7