From 2040016307bb777c46a46efd24f66ce90f3b7a17 Mon Sep 17 00:00:00 2001 From: annegentle Date: Mon, 8 Jul 2013 11:45:39 -0500 Subject: [PATCH] Adds new openstack Security Guide build job. Removes conditional apt or yum params from the Operations Guide build job. fix bug 1197632 Change-Id: I7cda80339dd3d36337e27b807a52d45a7a29e51a Reviewed-on: https://review.openstack.org/36102 Reviewed-by: Jeremy Stanley Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../jenkins_job_builder/config/manuals.yaml | 33 ++++++++++++++++++- .../openstack_project/files/zuul/layout.yaml | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) 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 d40beec40b..be6c13065a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -467,7 +467,7 @@ group-id: org.openstack.docs artifact-id: openstack-guide root-pom: doc/src/docbkx/openstack-ops/pom.xml - goals: '-Doperating.system=apt -Dprofile.os=ubuntu -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources' + goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources' publishers: - console-log-post @@ -477,3 +477,34 @@ target: '/' remove-prefix: 'doc/src/docbkx/openstack-ops/target/docbkx/webhelp/' excludes: '**/*.xml,**/null*' + +- job: + name: openstack-security-guide + project-type: maven + concurrent: false + node: precise + + properties: + - inject: + script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh + properties-file: gerrit-doc.properties + + prebuilders: + - gerrit-git-prep + + maven: + maven-name: Maven3 + root-module: + group-id: org.openstack.docs + artifact-id: openstack-guide + root-pom: doc/src/docbkx/openstack-security-guide/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/**' + target: '/' + remove-prefix: 'doc/src/docbkx/openstack-security-guide/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 e5e1ffa87d..6bf2d6d1f0 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1378,6 +1378,7 @@ projects: - openstack-ha-guide - openstack-install-deploy-guide-apt-fedora - openstack-install-deploy-guide-ubuntu + - openstack-security-guide - manuals-upstream-translation-update - name: openstack/operations-guide