From b71a3e93159cee3e9e6fd3bca9d3b629f574152d Mon Sep 17 00:00:00 2001
From: annegentle <anne@openstack.org>
Date: Wed, 10 Jul 2013 15:58:23 -0500
Subject: [PATCH] Fix Jenkins job that's failing for Security Guide.
There's no copy of the Security Guide in the
stable/grizzly branch of openstack-manuals so
setting to just build from master branch in zuul.
Fix bug 1197632
Change-Id: I694d23ed96b43aaa9b12406f217f74975b1b06ac
Reviewed-on: https://review.openstack.org/36549
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Tom Fifield <tom@openstack.org>
Reviewed-by: Khai Do <zaro0508@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
.../files/jenkins_job_builder/config/manuals.yaml | 6 +++---
modules/openstack_project/files/zuul/layout.yaml | 2 ++
2 files changed, 5 insertions(+), 3 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 be6c13065a..cbaf4aae3a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -497,14 +497,14 @@
root-module:
group-id: org.openstack.docs
artifact-id: openstack-guide
- root-pom: doc/src/docbkx/openstack-security-guide/pom.xml
+ root-pom: doc/src/docbkx/openstack-security/pom.xml
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- ftp:
site: docs.openstack.org
- source: 'doc/src/docbkx/openstack-security-guide/target/docbkx/webhelp/**'
+ source: 'doc/src/docbkx/openstack-security/target/docbkx/webhelp/**'
target: '/'
- remove-prefix: 'doc/src/docbkx/openstack-security-guide/target/docbkx/webhelp/'
+ remove-prefix: 'doc/src/docbkx/openstack-security/target/docbkx/webhelp/'
excludes: '**/*.xml,**/null*'
\ No newline at end of file
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index e6c3d309c3..1595361933 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -119,6 +119,8 @@ jobs:
branch: ^master$
- name: openstack-ha-guide
branch: ^master$
+ - name: openstack-security-guide
+ branch: ^master$
- name: gate-openstack-cli-guide
success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
- name: ^gate-.*-docs$