From a2d2cfdf876229b4d06696aa04e57ec6dd91cbf2 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Fri, 17 Jan 2014 22:48:01 +0800 Subject: [PATCH] Add build job for Japanese Install Guide We now have a 100% translated Japanese install guide good to go. This patch adds a new install-guide build job for foreign languages, done in a generic way so future foreign languages can be easily added. It adds Japanese language build jobs, since this is the first fully translated language. In addition, the opportunity was taken to genericise the openstack-operations-guide-ja build job so it can be used for languages other than Japanese. NB: this is a first time working with templated jobs and variables, appreciate careful review ... especially don't want to break the openstack-operations-guide-ja job as I just got that working again! Change-Id: I8a1c6462e6a136e05d4313dbfc6dc600d8395b79 --- .../config/manuals-jobs.yaml | 39 +++++++++++++++++++ .../jenkins_job_builder/config/manuals.yaml | 16 ++++---- .../jenkins_job_builder/config/projects.yaml | 25 ++++++++++++ .../openstack_project/files/zuul/layout.yaml | 4 ++ 4 files changed, 76 insertions(+), 8 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml index 9d46fc465a..98f42dd08e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml @@ -82,6 +82,45 @@ target: '/' remove-prefix: 'doc/install-guide/target/docbkx/webhelp/' +- job-template: + name: 'openstack-install-deploy-guide-{distribution}-{lang}' + + 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 + - shell: | + ./tools/generatedocbook -l {lang} -b install-guide + + maven: + maven-name: Maven3 + root-module: + group-id: org.openstack.docs + artifact-id: openstack-guide + root-pom: generated/{lang}/install-guide/pom.xml + goals: '-Doperating.system={system} -Dprofile.os={profileos} -Drelease.path.name=${{DOC_RELEASE_PATH}} -Dcomments.enabled=${{DOC_COMMENTS_ENABLED}} clean generate-sources -B' + + publishers: + - console-log + - ftp: + site: docs.openstack.org + source: 'generated/{lang}/install-guide/target/docbkx/webhelp/**' + target: '/{lang}/' + remove-prefix: 'generated/{lang}/install-guide/target/docbkx/webhelp/' + excludes: '**/*.xml,**/null*' + - ftp: + site: docs.openstack.org + source: 'generated/{lang}/install-guide/target/docbkx/webhelp/**/atom.xml' + target: '/' + remove-prefix: 'generated/{lang}/install-guide/target/docbkx/webhelp/' + - job-template: name: openstack-{oldmanual}-old project-type: maven 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 0bdeeabdf5..8d5e7869a4 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -134,8 +134,8 @@ target: '' remove-prefix: 'doc/openstack-ops/target/docbkx/webhelp/' -- job: - name: openstack-operations-guide-ja +- job-template: + name: 'openstack-operations-guide-{lang}' project-type: maven concurrent: false node: precise @@ -148,21 +148,21 @@ prebuilders: - gerrit-git-prep - shell: | - ./tools/generatedocbook -l ja -b openstack-ops + ./tools/generatedocbook -l {lang} -b openstack-ops maven: maven-name: Maven3 root-module: group-id: org.openstack.docs artifact-id: openstack-ops-manual - root-pom: generated/ja/openstack-ops/pom.xml - goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources -B' + root-pom: generated/{lang}/openstack-ops/pom.xml + goals: '-Drelease.path.name=${{DOC_RELEASE_PATH}} -Dcomments.enabled=${{DOC_COMMENTS_ENABLED}} clean generate-sources -B' publishers: - console-log - ftp: site: docs.openstack.org - source: 'generated/ja/openstack-ops/target/docbkx/webhelp/**' - target: '/ja/' - remove-prefix: 'generated/ja/openstack-ops/target/docbkx/webhelp/' + source: 'generated/{lang}/openstack-ops/target/docbkx/webhelp/**' + target: '/{lang}/' + remove-prefix: 'generated/{lang}/openstack-ops/target/docbkx/webhelp/' excludes: '**/*.xml,**/null*' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 18eceb5c54..c6e7bddd66 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1795,6 +1795,9 @@ - network-connectivity-admin - object-storage-admin + lang: + - ja + jobs: - gate-openstack-manuals-validate-{check} @@ -1820,6 +1823,28 @@ system: apt profileos: "ubuntu" + - openstack-install-deploy-guide-{distribution}-{lang}: + distribution: debian + system: apt-debian + profileos: "debian" + + - openstack-install-deploy-guide-{distribution}-{lang}: + distribution: fedora + system: yum + profileos: "centos;fedora;rhel" + + - openstack-install-deploy-guide-{distribution}-{lang}: + distribution: opensuse + system: zypper + profileos: "opensuse;sles" + + - openstack-install-deploy-guide-{distribution}-{lang}: + distribution: ubuntu + system: apt + profileos: "ubuntu" + + - openstack-operations-guide-{lang} + # in zuul/layout.yaml specified to only run against # stable/grizzly - 'openstack-{oldmanual}-old' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f5dd095fc7..d99daf344a 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2042,6 +2042,10 @@ projects: - openstack-install-deploy-guide-opensuse - openstack-install-deploy-guide-ubuntu - openstack-openstack-install-ubuntu-old + - openstack-install-deploy-guide-debian-ja + - openstack-install-deploy-guide-fedora-ja + - openstack-install-deploy-guide-opensuse-ja + - openstack-install-deploy-guide-ubuntu-ja - openstack-security-guide - openstack-user-guide - openstack-user-guide-admin