From 63c99703f9ee8c5f6344c2951d7b667092a789f8 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 25 Jul 2013 14:55:06 -0500
Subject: [PATCH] Update yaml file to add new OpenStack End User Guide

Removes the cli gate job as it's not necessary.

bug: #1204244

Change-Id: I6a8a45d63a79c630be46542f507ab61be2cbfe5c
author: diane fleming
---
 .../jenkins_job_builder/config/manuals.yaml   | 36 +++----------------
 .../openstack_project/files/zuul/layout.yaml  |  6 +---
 2 files changed, 6 insertions(+), 36 deletions(-)

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 e492d53974..3095da37fe 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -1,29 +1,3 @@
-- job:
-    name: gate-openstack-manuals-cli-guide
-    project-type: maven
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/cli-guide/pom.xml
-      goals: 'clean generate-sources'
-
-    publishers:
-      - console-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'docs-draft/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/cli/quick-start'
-              source: 'doc/src/docbkx/cli-guide/target/docbkx/webhelp/cli-guide/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-
 - job:
     name: gate-openstack-manuals-operations-guide
     project-type: maven
@@ -62,7 +36,7 @@
       - console-log
 
 - job:
-    name: openstack-cli-guide
+    name: openstack-user-guide
     project-type: maven
     node: precise
 
@@ -74,16 +48,16 @@
       root-module:
         group-id: org.openstack.docs
         artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/cli-guide/pom.xml
+      root-pom: doc/src/docbkx/openstack-user/pom.xml
       goals: 'clean generate-sources'
 
     publishers:
       - console-log
       - ftp:
           site: docs.openstack.org
-          source: 'doc/src/docbkx/cli-guide/target/docbkx/webhelp/cli-guide/**'
-          target: 'cli/quick-start'
-          remove-prefix: 'doc/src/docbkx/cli-guide/target/docbkx/webhelp/cli-guide/'
+          source: 'doc/src/docbkx/openstack-user/target/docbkx/webhelp/user-guide/**'
+          target: ''
+          remove-prefix: 'doc/src/docbkx/openstack-user/target/docbkx/webhelp/'
           excludes: '**/*.xml,**/null*'
 
 - job:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 603ba421ba..5d8a043ca2 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -140,8 +140,6 @@ jobs:
     branch: ^master$
   - name: openstack-security-guide
     branch: ^master$
-  - name: gate-openstack-cli-guide
-    success-pattern: http://docs-draft.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}/cli/quick-start
   - name: ^gate-.*-docs$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}/doc/build/html/
   - name: infra-publications-publish
@@ -1555,17 +1553,15 @@ projects:
 
   - name: openstack/openstack-manuals
     check:
-      - gate-openstack-manuals-cli-guide
       - gate-openstack-manuals-validate
     gate:
-      - gate-openstack-manuals-cli-guide
       - gate-openstack-manuals-validate
     post:
       - openstack-admin-manual-compute
       - openstack-admin-manual-netconn
       - openstack-admin-manual-object
       - openstack-admin-manual-block
-      - openstack-cli-guide
+      - openstack-user-guide
       - openstack-basic-install-fedora
       - openstack-basic-install-ubuntu
       - openstack-glossary