From 450575d094ddd1e807252d576b60ad214a079668 Mon Sep 17 00:00:00 2001
From: annegentle <anne@openstack.org>
Date: Fri, 22 Mar 2013 10:57:34 -0500
Subject: [PATCH] Moves api doc jobs to the api-jobs.yaml file.

No other changes, just moving.

Change-Id: Ia418f630d28640ed891a7b93bed4e72f08fa0f31
Reviewed-on: https://review.openstack.org/25145
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Elizabeth Krumbach <lyz@princessleia.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
 .../jenkins_job_builder/config/api-jobs.yaml  | 70 +++++++++++++++++++
 .../jenkins_job_builder/config/manuals.yaml   | 69 ------------------
 2 files changed, 70 insertions(+), 69 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 dd92a77a87..2b2f6a7e7c 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
@@ -126,6 +126,48 @@
           excludes: ''
       - console-log-post
 
+- job:
+    name: image-api-v20
+    project-type: maven
+    concurrent: true
+    node: quantal && !jclouds
+
+    wrappers:
+      - timeout:
+          timeout: 40
+          fail: true
+
+    triggers:
+      - zuul-post
+
+    prebuilders:
+      - gerrit-git-prep
+      - markdown-docbook:
+          filename: "image-api-v2.0"
+
+    properties:
+      - inject:
+          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
+          properties-file: gerrit-doc.properties
+
+    maven:
+      maven-name: Maven3
+      root-module:
+        group-id: org.openstack.docs
+        artifact-id: openstack-guide
+      root-pom: openstack-image-service-api/src/markdown/pom.xml
+      goals: 'clean generate-sources'
+
+    publishers:
+      - console-log-post
+      - ftp:
+          site: docs.openstack.org
+          source: 'openstack-image-service-api/src/markdown/target/docbkx/webhelp/api/openstack-image-service/2.0/**'
+          target: '/'
+          remove-prefix: 'openstack-image-service-api/src/markdown/target/docbkx/webhelp/'
+          excludes: '**/*.xml,**/null*'
+
+
 # this replaces the old openstack-netconn-api-doc job
 - job:
     name: network-api-v10
@@ -156,6 +198,34 @@
           remove-prefix: 'doc/target/docbkx/webhelp'
           excludes: '**/*.xml,**/null*'
 
+- job:
+    name: netconn-api-v20
+    project-type: maven
+    node: quantal && !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: doc/pom.xml
+      goals: 'clean generate-sources'
+
+    publishers:
+      - console-log-post
+      - ftp:
+          site: docs.openstack.org
+          source: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/**'
+          target: 'api/openstack-network/2.0/'
+          remove-prefix: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/'
+          excludes: '**/*.xml,**/null*'
+
 - job:
     name: openstack-object-api-doc
     project-type: maven
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 7065cd17ae..11a670e589 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -126,75 +126,6 @@
           remove-prefix: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/'
           excludes: '**/*.xml,**/null*'
 
-- job:
-    name: netconn-api-v20
-    project-type: maven
-    node: quantal && !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: doc/pom.xml
-      goals: 'clean generate-sources'
-
-    publishers:
-      - console-log-post
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/**'
-          target: 'api/openstack-network/2.0/'
-          remove-prefix: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/'
-          excludes: '**/*.xml,**/null*'
-
-- job:
-    name: image-api-v20
-    project-type: maven
-    concurrent: true
-    node: quantal && !jclouds
-
-    wrappers:
-      - timeout:
-          timeout: 40
-          fail: true
-
-    triggers:
-      - zuul-post
-
-    prebuilders:
-      - gerrit-git-prep
-      - markdown-docbook:
-          filename: "image-api-v2.0"
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: openstack-image-service-api/src/markdown/pom.xml
-      goals: 'clean generate-sources'
-
-    publishers:
-      - console-log-post
-      - ftp:
-          site: docs.openstack.org
-          source: 'openstack-image-service-api/src/markdown/target/docbkx/webhelp/api/openstack-image-service/2.0/**'
-          target: '/'
-          remove-prefix: 'openstack-image-service-api/src/markdown/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
 - job:
     name: openstack-glossary
     project-type: maven