From 445555cba6d25d31fbdb057b59f26bfb1b631f04 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Tue, 28 Jan 2014 18:15:17 +0100
Subject: [PATCH] Use openstack-doc-tools gates for openstack-manuals

Use tox based gating, remove previous jobs.

Change-Id: I78006d4bac9b744aa107806907e880f73a7b1c30
---
 .../config/manuals-jobs.yaml                    | 11 -----------
 .../jenkins_job_builder/config/projects.yaml    | 11 ++++-------
 .../openstack_project/files/zuul/layout.yaml    | 17 ++++++-----------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
index 98f42dd08e..ff43f886b8 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
@@ -1,14 +1,3 @@
-- job-template:
-    name: gate-openstack-manuals-validate-{check}
-    node: precise
-
-    builders:
-      - gerrit-git-prep
-      - shell: "./tools/test.py --check-{check}"
-
-    publishers:
-      - console-log
-
 - job-template:
     name: 'openstack-{manual}'
     project-type: maven
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index a0daee2684..7d4f99df58 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1823,12 +1823,9 @@
 
 
 - project:
-    name: manuals
-    check:
-       - niceness
-       - syntax
-       - deletions
-       - build
+    name: openstack-manuals
+    github-org: openstack
+    node: precise
 
     manual:
       - admin-guide-cloud
@@ -1850,7 +1847,7 @@
         - ja
 
     jobs:
-      - gate-openstack-manuals-validate-{check}
+      - openstack-doc-jobs
 
       - 'openstack-{manual}'
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d01c03c63a..d50a5ec60b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -350,14 +350,14 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: openstack-install-deploy-guide-ubuntu
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-validate-niceness
+  - name: gate-openstack-manuals-tox-checkniceness
     branch: ^(?!stable/grizzly).*$
     voting: false
-  - name: gate-openstack-manuals-validate-syntax
+  - name: gate-openstack-manuals-tox-checksyntax
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-validate-deletions
+  - name: gate-openstack-manuals-tox-checkdeletions
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-validate-build
+  - name: gate-openstack-manuals-tox-checkbuild
     branch: ^(?!stable/grizzly).*$
   - name: ^gate-.*-tox-checkniceness$
     voting: false
@@ -2022,16 +2022,11 @@ projects:
       - manuals-propose-translation-update
 
   - name: openstack/openstack-manuals
+    template:
+      - name: openstack-doc-gate
     check:
-      - gate-openstack-manuals-validate-niceness
-      - gate-openstack-manuals-validate-syntax
-      - gate-openstack-manuals-validate-deletions
-      - gate-openstack-manuals-validate-build
       - gate-openstack-manuals-validate
     gate:
-      - gate-openstack-manuals-validate-syntax
-      - gate-openstack-manuals-validate-deletions
-      - gate-openstack-manuals-validate-build
       - gate-openstack-manuals-validate
     post:
       - openstack-admin-guide-cloud