From c230fb871b9844094013ff006a86de72225ef770 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 2 Mar 2014 19:38:01 +0100 Subject: [PATCH] Remove maven from operations-guide and openstack-manuals Use tox based publishing instead of maven. The operations-guide jobs now named operations-guide-tox-doc-publishdocs. For openstack-manuals use openstack-manuals-tox-doc-publishdocs as single publishing job instead of the many jobs that build a single book each. Removes job openstack-docs-site as well, the openstack-doc-tools script together with this change handles this as well. Needs change to template '{name}-tox-doc-{envlist}' for injecting of properties-file. Also, update 'openstack-operations-guide-{lang}' and 'openstack-install-deploy-guide-{lang}' to use upload-to-docs-site publisher instead of hand-written one. Change-Id: Iea3005d2d092342318bd7be475af4ed78a9c1390 --- .../jenkins_job_builder/config/api-jobs.yaml | 5 + .../config/manuals-jobs.yaml | 79 +------------ .../jenkins_job_builder/config/manuals.yaml | 105 +----------------- .../jenkins_job_builder/config/projects.yaml | 36 +----- .../openstack_project/files/zuul/layout.yaml | 38 +------ 5 files changed, 13 insertions(+), 250 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml index 444000a1c8..40013c330a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -1,6 +1,11 @@ - job-template: name: '{name}-tox-doc-{envlist}' + properties: + - inject: + script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh + properties-file: gerrit-doc.properties + wrappers: - timeout: timeout: 40 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 ce253af5b3..7c8a7a956d 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 @@ -1,76 +1,3 @@ -- job-template: - name: 'openstack-{manual}' - project-type: maven - node: bare-precise - - prebuilders: - - revoke-sudo - - gerrit-git-prep - - properties: - - inject: - script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh - properties-file: gerrit-doc.properties - - maven: - maven-name: Maven3 - root-module: - group-id: org.openstack.docs - artifact-id: openstack-guide - root-pom: doc/{manual}/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: 'doc/{manual}/target/docbkx/webhelp/**' - target: '' - remove-prefix: 'doc/{manual}/target/docbkx/webhelp/' - excludes: '**/*.xml,**/null*' - - ftp: - site: docs.openstack.org - source: 'doc/{manual}/target/docbkx/webhelp/**/atom.xml' - target: '' - remove-prefix: 'doc/{manual}/target/docbkx/webhelp/' - -- job-template: - name: 'openstack-install-deploy-guide-{distribution}' - - project-type: maven - node: bare-precise - - properties: - - inject: - script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh - properties-file: gerrit-doc.properties - - prebuilders: - - revoke-sudo - - gerrit-git-prep - - maven: - maven-name: Maven3 - root-module: - group-id: org.openstack.docs - artifact-id: openstack-guide - root-pom: doc/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: 'doc/install-guide/target/docbkx/webhelp/**' - target: '/' - remove-prefix: 'doc/install-guide/target/docbkx/webhelp/' - excludes: '**/*.xml,**/null*' - - ftp: - site: docs.openstack.org - source: 'doc/install-guide/target/docbkx/webhelp/**/atom.xml' - target: '/' - remove-prefix: 'doc/install-guide/target/docbkx/webhelp/' - - job-template: name: 'openstack-install-deploy-guide-{lang}' @@ -90,11 +17,7 @@ publishers: - console-log - - ftp: - site: docs.openstack.org - source: 'publish-docs/{lang}/**' - target: '/{lang}/' - remove-prefix: 'publish-docs/{lang}/' + - upload-to-docs-site - job-template: name: 'openstack-misc-guides-{lang}' 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 01ba38593b..7a95b7c638 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -1,101 +1,3 @@ -# in zuul/layout.yaml specified to only run against master branch. -- job: - name: openstack-docs-site - node: bare-precise - - builders: - - revoke-sudo - - gerrit-git-prep - - publishers: - - ftp: - site: docs.openstack.org - source: 'www/**' - target: '' - remove-prefix: 'www/' - excludes: '' - - console-log - -# in zuul/layout.yaml specified to only run against master branch. -# The old jenkins config polled git 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 git and snapshot dependency triggers if that is preferable. -- job: - name: openstack-ha-guide - project-type: maven - node: bare-precise - - properties: - - inject: - script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh - properties-file: gerrit-doc.properties - - prebuilders: - - revoke-sudo - - gerrit-git-prep - - shell: | - asciidoc -b docbook -d book -o - doc/high-availability-guide/ha-guide.txt | xsltproc -o - /usr/share/xml/docbook/stylesheet/docbook5/db4-upgrade.xsl - | xmllint --format - | sed -e 's, doc/high-availability-guide/bk-ha-guide.xml - - maven: - maven-name: Maven3 - root-module: - group-id: org.openstack.docs - artifact-id: openstack-guide - root-pom: doc/high-availability-guide/pom.xml - goals: 'clean generate-sources -B' - - publishers: - - console-log - - ftp: - site: docs.openstack.org - source: 'doc/high-availability-guide/target/docbkx/webhelp/**' - target: '' - remove-prefix: 'doc/high-availability-guide/target/docbkx/webhelp/' - excludes: '**/*.xml,**/null*' - - ftp: - site: docs.openstack.org - source: 'doc/high-availability-guide/target/docbkx/webhelp/**/atom.xml' - target: '' - remove-prefix: 'doc/high-availability-guide/target/docbkx/webhelp/' - -- job: - name: openstack-operations-guide - project-type: maven - node: bare-precise - - properties: - - inject: - script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh - properties-file: gerrit-doc.properties - - prebuilders: - - revoke-sudo - - gerrit-git-prep - - maven: - maven-name: Maven3 - root-module: - group-id: org.openstack.docs - artifact-id: openstack-guide - root-pom: doc/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: 'doc/openstack-ops/target/docbkx/webhelp/**' - target: '/' - remove-prefix: 'doc/openstack-ops/target/docbkx/webhelp/' - excludes: '**/*.xml,**/null*' - - ftp: - site: docs.openstack.org - source: 'doc/openstack-ops/target/docbkx/webhelp/**/atom.xml' - target: '' - remove-prefix: 'doc/openstack-ops/target/docbkx/webhelp/' - - job-template: name: 'openstack-operations-guide-{lang}' node: bare-precise @@ -116,9 +18,4 @@ publishers: - console-log - - ftp: - site: docs.openstack.org - source: 'publish-docs/{lang}/**' - target: '/{lang}/' - remove-prefix: 'publish-docs/{lang}/' - excludes: '**/*.xml,**/null*' + - upload-to-docs-site 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 4db5bbbd78..a3dff6a3fc 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -2052,17 +2052,6 @@ github-org: openstack node: bare-precise - manual: - - admin-guide-cloud - - cli-reference - - config-reference - - glossary - - image-guide - - security-guide - - training-guides - - user-guide - - user-guide-admin - oldmanual: - block-storage-admin - compute-admin @@ -2076,27 +2065,8 @@ - openstack-doc-jobs - manual-translation-jobs - - 'openstack-{manual}' - - - openstack-install-deploy-guide-{distribution}: - distribution: debian - system: apt-debian - profileos: "debian" - - - openstack-install-deploy-guide-{distribution}: - distribution: fedora - system: yum - profileos: "centos;fedora;rhel" - - - openstack-install-deploy-guide-{distribution}: - distribution: opensuse - system: zypper - profileos: "opensuse;sles" - - - openstack-install-deploy-guide-{distribution}: - distribution: ubuntu - system: apt - profileos: "ubuntu" + - '{name}-tox-doc-{envlist}': + envlist: publishdocs - openstack-install-deploy-guide-{lang} @@ -2112,6 +2082,8 @@ jobs: - openstack-doc-jobs - manual-translation-jobs + - '{name}-tox-doc-{envlist}': + envlist: publishdocs - project: name: manila diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 6fe4b3d9b3..5a00860e2e 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -393,26 +393,6 @@ jobs: files: - 'modules/openstack_project/files/accessbot/channels.yaml' # Continous publishing from master of the following documentation targets: - - name: openstack-admin-guide-cloud - branch: master - - name: openstack-docs-site - branch: master - - name: openstack-cli-reference - branch: master - - name: openstack-glossary - branch: master - - name: openstack-ha-guide - branch: master - - name: openstack-image-guide - branch: master - - name: openstack-user-guide - branch: master - - name: openstack-user-guide-admin - branch: master - - name: openstack-security-guide - branch: master - - name: openstack-training-guides - branch: master - name: ^.*manuals-upstream-translation-update$ branch: master - name: gate-openstack-manuals-tox-checkniceness @@ -2343,30 +2323,16 @@ projects: - name: openstack-doc-gate - name: openstack-doc-translation post: - - openstack-admin-guide-cloud - - openstack-glossary - - openstack-image-guide - - openstack-cli-reference - - openstack-config-reference - - openstack-docs-site - - openstack-ha-guide - - openstack-install-deploy-guide-debian - - openstack-install-deploy-guide-fedora - - openstack-install-deploy-guide-opensuse - - openstack-install-deploy-guide-ubuntu + - openstack-manuals-tox-doc-publishdocs - openstack-install-deploy-guide-ja - openstack-misc-guides-ja - - openstack-security-guide - - openstack-user-guide - - openstack-user-guide-admin - - openstack-training-guides - name: openstack/operations-guide template: - name: openstack-doc-gate - name: openstack-doc-translation post: - - openstack-operations-guide + - operations-guide-tox-doc-publishdocs - openstack-operations-guide-ja - name: openstack/openstack-security-notes