From 8e113d46c0e22b2878d14060dd08f8d07619cabc Mon Sep 17 00:00:00 2001 From: annegentle Date: Wed, 24 Apr 2013 15:23:42 -0500 Subject: [PATCH] Splits the basic-install guide into two builds for Fedora/Ubuntu. Change-Id: Ic3697239f2ae0421bfe3faab4dcd1450602deb8a Reviewed-on: https://review.openstack.org/27443 Reviewed-by: Jeremy Stanley Reviewed-by: Anita Kuno Reviewed-by: Khai Do Reviewed-by: Clark Boylan Approved: Clark Boylan Tested-by: Jenkins --- .../files/slave_scripts/docbook-properties.sh | 2 +- .../jenkins_job_builder/config/manuals.yaml | 42 +++++++++++++++++-- .../openstack_project/files/zuul/layout.yaml | 3 +- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/docbook-properties.sh b/modules/jenkins/files/slave_scripts/docbook-properties.sh index a8c7e79523..93bcd47c92 100644 --- a/modules/jenkins/files/slave_scripts/docbook-properties.sh +++ b/modules/jenkins/files/slave_scripts/docbook-properties.sh @@ -16,7 +16,7 @@ then DOC_COMMENTS_ENABLED=0 fi -# The stable/ branch should get published to /releasename, such as folsom or essex +# The stable/ branch should get published to /releasename, such as grizzly or folsom if [[ $BRANCH =~ ^stable/(.*)$ ]] then DOC_RELEASE_PATH=${BASH_REMATCH[1]} 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 8d94698bf7..460661b149 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -99,7 +99,40 @@ excludes: '**/*.xml,**/null*' - job: - name: openstack-basic-install + name: openstack-basic-install-fedora + project-type: maven + node: quantal && !jclouds + + triggers: + - zuul-post + + 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/basic-install/pom.xml + goals: '-Doperating.system=yum -Dprofile.os=centos;fedora;rhel -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/basic-install/target/docbkx/webhelp/**' + target: '/yum' + remove-prefix: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/' + excludes: '**/*.xml,**/null*' + +- job: + name: openstack-basic-install-ubuntu project-type: maven node: quantal && !jclouds @@ -114,20 +147,23 @@ 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/basic-install/pom.xml - goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources' + goals: '-Doperating.system=apt -Dprofile.os=ubuntu -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/basic-install/target/docbkx/webhelp/**' - target: '/' + target: '/apt' remove-prefix: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/' excludes: '**/*.xml,**/null*' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index c07ccc2980..9c4c5ddbc5 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1249,7 +1249,8 @@ projects: - openstack-admin-manual-object - openstack-admin-manual-block - openstack-cli-guide - - openstack-basic-install + - openstack-basic-install-fedora + - openstack-basic-install-ubuntu - openstack-glossary - openstack-docs-site - openstack-ha-guide