From 2f261bc1ee819946b85a454163345d4bb5d2aa9c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 3 Oct 2012 11:36:09 -0700 Subject: [PATCH] Convert 3 of the OS guide jobs to yaml configs. Convert openstack-ha-guide, openstack-install-deploy-guide-apt-fedora, and openstack-install-deploy-guide-ubuntu jobs to Jenkins Job Builder yaml configs. Each has been converted to run in the zuul post queue as well. Change-Id: Icce086f0a4531b8f91330ab5a4aa15128f429d64 Reviewed-on: https://review.openstack.org/14000 Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- .../jenkins_job_builder/config/manuals.yaml | 108 ++++++++++++++++++ .../openstack_project/files/zuul/layout.yaml | 5 + 2 files changed, 113 insertions(+) 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 70ef6dc7de..165e173605 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -361,3 +361,111 @@ remove-prefix: 'www/' excludes: '' - console-log-post + +# in zuul/layout.yaml specified to only run against master branch. +# The old jenkins config polled github every 5 minutes and was also triggered +# whenever a SNAPSHOT dependency was built. I have not configured that trigger +# here as being in the Zuul post queue may not play nice with that. +# +# We can use the github and snapshot dependency triggers if that is preferable. +- job: + name: openstack-ha-guide + project-type: maven + concurrent: false + node: precise + + triggers: + - zuul-post + + properties: + - inject: + script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh + properties-file: gerrit-doc.properties + + prebuilders: + - gerrit-git-prep + - shell: | + asciidoc -b docbook -d book -o - doc/src/docbkx/openstack-ha/ha-guide.txt | xsltproc -o - /usr/share/xml/docbook/stylesheet/docbook5/db4-upgrade.xsl - | xmllint --format - | sed -e 's, doc/src/docbkx/openstack-ha/bk-ha-guide.xml + + maven: + root-module: + group-id: org.openstack.docs + artifact-id: openstack-guide + root-pom: doc/src/docbkx/openstack-ha/pom.xml + goals: 'clean generate-sources' + + publishers: + - console-log-post + - ftp: + site: docs.openstack.org + source: 'doc/src/docbkx/openstack-ha/target/docbkx/webhelp/trunk/**' + target: 'trunk' + remove-prefix: 'doc/src/docbkx/openstack-ha/target/docbkx/webhelp/trunk/' + excludes: '**/*.xml,**/null*' + +- job: + name: openstack-install-deploy-guide-apt-fedora + project-type: maven + concurrent: false + node: precise + + 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: + root-module: + group-id: org.openstack.docs + artifact-id: openstack-guide + root-pom: doc/src/docbkx/openstack-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/openstack-install/target/docbkx/webhelp/**' + target: '/' + remove-prefix: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/' + excludes: '**/*.xml,**/null*' + +- job: + name: openstack-install-deploy-guide-ubuntu + project-type: maven + concurrent: false + node: precise + + 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: + root-module: + group-id: org.openstack.docs + artifact-id: openstack-guide + root-pom: doc/src/docbkx/openstack-install/pom.xml + 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/openstack-install/target/docbkx/webhelp/**' + target: '/' + remove-prefix: 'doc/src/docbkx/openstack-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 42ca3ff3c8..d7154f03f6 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -74,6 +74,8 @@ jobs: voting: false - name: openstack-docs-site branch: ^master$ + - name: openstack-ha-guide + branch: ^master$ projects: @@ -661,6 +663,9 @@ projects: - openstack-cli-guide - openstack-glossary - openstack-docs-site + - openstack-ha-guide + - openstack-install-deploy-guide-apt-fedora + - openstack-install-deploy-guide-ubuntu - name: openstack/compute-api check: