From 1d60f3c4c353ce955de0c02d1c87716ecf85b13a Mon Sep 17 00:00:00 2001
From: Mike Perez <thingee@gmail.com>
Date: Mon, 25 Feb 2013 21:09:19 -0800
Subject: [PATCH] Adding job for generating cinder v2 api docs

* v1 doc in review: https://review.openstack.org/#/c/22411
* v2 doc in review: https://review.openstack.org/#/c/22822

In addition this removes the volume-api job from the manuals. The block
storage manaual is still being separated from compute at this time.

Change-Id: I2da33cf20bac5473318237afe1b39fc41de1557a
Reviewed-on: https://review.openstack.org/22954
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
 .../jenkins_job_builder/config/api-jobs.yaml  | 29 ++++++++++++++++
 .../jenkins_job_builder/config/manuals.yaml   | 34 -------------------
 .../openstack_project/files/zuul/layout.yaml  |  2 +-
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
index 5e0b64cc91..dd92a77a87 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
@@ -235,6 +235,35 @@
           excludes: '**/*.xml,**/null*'
       - console-log-post
 
+- job:
+    name: openstack-block-api-doc
+    project-type: maven
+    concurrent: false
+    node: precise && !jclouds
+
+    triggers:
+      - zuul-post
+
+    prebuilders:
+      - gerrit-git-prep
+
+    maven:
+      maven-name: Maven3
+      root-module:
+        group-id: org.openstack.docs
+        artifact-id: openstack-guide
+      root-pom: v2/pom.xml
+      goals: 'clean generate-sources'
+
+    publishers:
+      - console-log-post
+      - ftp:
+          site: docs.openstack.org
+          source: 'v2/target/docbkx/webhelp/api/openstack-block-storage/2.0/**'
+          target: ''
+          remove-prefix: 'v2/target/docbkx/webhelp'
+          excludes: '**/*.xml,**/null*'
+
 # this replaces the old openstack-identity-api-doc job
 - job:
     name: identity-api-v20
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
index b9ed6af4d3..16efa05414 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -125,40 +125,6 @@
           remove-prefix: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/'
           excludes: '**/*.xml,**/null*'
 
-- job:
-    name: volume-api
-    project-type: maven
-    concurrent: true
-    node: quantal && !jclouds
-
-    wrappers:
-      - timeout:
-          timeout: 40
-          fail: true
-
-    triggers:
-      - zuul-post
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/pom.xml
-      goals: 'clean generate-sources'
-
-    publishers:
-      - console-log-post
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/target/docbkx/webhelp/volume-api-1.0/volume-api-guide/**'
-          target: 'api/openstack-volume/1.0/'
-          remove-prefix: 'doc/target/docbkx/webhelp/volume-api-1.0/volume-api-guide/'
-          excludes: '**/*.xml,**/null*'
-
 - job:
     name: image-api-v20
     project-type: maven
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9f8ad67bcf..6e13cb2c5f 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1130,7 +1130,7 @@ projects:
     gate:
       - gate-noop
     post:
-      - volume-api
+      - openstack-block-api-doc
 
   - name: openstack/openstack-chef
     check: