From bea97f064da689dc5baff19b622ecaf4e579d1c0 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Mon, 30 Sep 2013 13:47:16 -0500
Subject: [PATCH] Updated api.yaml for the netconn-api v1.0 and v2.0 refs - pom
 location changed

Partial-Bug: #1233748

Change-Id: I2e90b4e5402e218807ced0b43a8d369cd419952d
author: diane fleming
---
 .../jenkins_job_builder/config/api-jobs.yaml  | 20 +++++++++----------
 .../openstack_project/files/zuul/layout.yaml  |  4 ++--
 2 files changed, 12 insertions(+), 12 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 a87d14038f..7f4ab5517c 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
@@ -116,7 +116,7 @@
 
 # this replaces the old openstack-netconn-api-doc job
 - job:
-    name: network-api-v1.0
+    name: network-api-v1
     project-type: maven
     concurrent: false
     node: precise
@@ -128,21 +128,21 @@
       maven-name: Maven3
       root-module:
         group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/pom.xml
+        artifact-id: openstack-network-api-v1
+      root-pom: v1.0/pom.xml
       goals: 'clean generate-sources -B'
 
     publishers:
       - console-log
       - ftp:
           site: docs.openstack.org
-          source: 'doc/target/docbkx/webhelp/api/openstack-network/1.0/**'
+          source: 'v1.0/target/docbkx/webhelp/openstack-network/**'
           target: ''
-          remove-prefix: 'doc/target/docbkx/webhelp'
+          remove-prefix: 'v1.0/target/docbkx/webhelp'
           excludes: '**/*.xml,**/null*'
 
 - job:
-    name: netconn-api-v2.0
+    name: network-api-v2
     project-type: maven
     node: precise
 
@@ -153,17 +153,17 @@
       maven-name: Maven3
       root-module:
         group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/pom.xml
+        artifact-id: openstack-network-api-v2
+      root-pom: v2.0/pom.xml
       goals: 'clean generate-sources -B'
 
     publishers:
       - console-log
       - ftp:
           site: docs.openstack.org
-          source: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/**'
+          source: 'v2.0/target/docbkx/webhelp/openstack-network/**'
           target: 'api/openstack-network/2.0/'
-          remove-prefix: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/'
+          remove-prefix: 'v2.0/target/docbkx/webhelp/openstack-network/'
           excludes: '**/*.xml,**/null*'
 
 - job:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 455ca0884e..f7ebbc1d77 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2113,8 +2113,8 @@ projects:
     gate:
       - gate-noop
     post:
-      - network-api-v1.0
-      - netconn-api-v2.0
+      - network-api-v1
+      - network-api-v2
 
   - name: openstack/object-api
     check: