From 38e80143dd347adaaab5f18de1f28bbd704fdf21 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 30 Jun 2014 21:33:53 +0200 Subject: [PATCH] Cleanup manual jobs This patch simplifies the setup and takes benefit of a new tox environment called "publishlang" in the repositories that publishes all translated manuals. This avoids having to change several places to add a single manual for a new language. 1) Move - '{name}-tox-doc-{envlist}': envlist: publishdocs to openstack-doc-jobs job-group and remove it from the individual jobs. 2) Create new job '{name}-tox-doc-publishlang' and add it to manual-translation-jobs. 3) Remove all buildlang jobs and replace them in Zuul with publishlang jobs using openstack-doc-translation template. The publishlang job handles all languages while the buildlang jobs were needed for each and every language. The buildlang jobs were openstack-install-deploy-guide-{lang}, openstack-misc-guides-{lang}, openstack-operations-guide-{lang}, api-site-tox-buildlang-{lang}. 4) Move security-doc in projects.yaml after operations-guide to have manual jobs together. Change-Id: I8932817cf6eebc2df636b119b0d723e9335b8ffe --- .../jenkins_job_builder/config/api-jobs.yaml | 17 ----- .../config/manuals-jobs.yaml | 66 +------------------ .../jenkins_job_builder/config/projects.yaml | 62 +++-------------- .../config/translation-jobs.yaml | 2 + .../openstack_project/files/zuul/layout.yaml | 13 +--- 5 files changed, 15 insertions(+), 145 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 91e15e59df..0f49e75600 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 @@ -21,23 +21,6 @@ node: '{node}' -- job-template: - name: 'api-site-tox-buildlang-{lang}' - - node: 'bare-precise || bare-trusty' - - builders: - - revoke-sudo - - gerrit-git-prep - - shell: | - source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack api-site - tox -v -e buildlang -- {lang} - - publishers: - - console-log - - upload-to-docs-site - - upload-doc-build-results - - job: name: openstack-api-ref node: 'bare-precise || bare-trusty' 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 0a31b94126..0d91cbe5c1 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,67 +1,3 @@ -- job-template: - name: 'openstack-install-deploy-guide-{lang}' - - node: 'bare-precise || bare-trusty' - - builders: - - revoke-sudo - - gerrit-git-prep - - shell: | - source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack openstack-manuals - tox -v -e buildlang-install -- {lang} - - publishers: - - console-log - - upload-to-docs-site - -- job-template: - name: 'openstack-misc-guides-{lang}' - - node: 'bare-precise || bare-trusty' - - builders: - - revoke-sudo - - gerrit-git-prep - - shell: | - source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack openstack-manuals - tox -v -e buildlang-misc -- {lang} - - publishers: - - console-log - - upload-to-docs-site - -- job-template: - name: 'openstack-operations-guide-{lang}' - node: '{node}' - - builders: - - revoke-sudo - - gerrit-git-prep - - shell: | - #!/bin/bash -xe - source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack operations-guide - tox -v -e buildlang -- {lang} - - publishers: - - console-log - - upload-to-docs-site - -- job-template: - name: 'security-doc-{lang}' - node: '{node}' - - builders: - - revoke-sudo - - gerrit-git-prep - - shell: | - #!/bin/bash -xe - source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack security-doc - tox -v -e buildlang -- {lang} - - publishers: - - console-log - - upload-to-docs-site - - job-template: name: 'gate-{name}-tox-doc-publish-{envlist}' @@ -97,3 +33,5 @@ envlist: checkdeletions - gate-{name}-tox-doc-publish-{envlist}: envlist: checkbuild + - '{name}-tox-doc-{envlist}': + envlist: publishdocs 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 fb1bf96c60..020a029f30 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -36,8 +36,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: name: fuel-specs @@ -393,8 +391,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: @@ -706,8 +702,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: @@ -729,8 +723,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: @@ -787,8 +779,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: @@ -856,8 +846,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: @@ -1202,8 +1190,6 @@ datastore: 'mysql' - 'gate-trove-buildimage-{datastore}': datastore: 'mongodb' - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: name: python-troveclient @@ -2441,20 +2427,10 @@ - network-connectivity-admin - object-storage-admin - lang: - - ja - jobs: - openstack-doc-jobs - manual-translation-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - - - openstack-install-deploy-guide-{lang} - - - openstack-misc-guides-{lang} - - project: name: docs-specs github-org: openstack @@ -2473,10 +2449,15 @@ jobs: - openstack-doc-jobs - manual-translation-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - - openstack-operations-guide-{lang}: - lang: ja + +- project: + name: security-doc + github-org: openstack + node: 'bare-precise || bare-trusty' + + jobs: + - openstack-doc-jobs + - manual-translation-jobs - project: name: manila @@ -2692,18 +2673,9 @@ github-org: openstack node: 'bare-precise || bare-trusty' - lang: - - de - - es - - fr - - ja - jobs: - openstack-doc-jobs - manual-translation-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - - 'api-site-tox-buildlang-{lang}' - project: name: driverlog @@ -2721,8 +2693,6 @@ jobs: - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - project: name: python-openstacksdk @@ -2875,17 +2845,3 @@ jobs: - gate-{name}-python27 - gate-{name}-docs - -- project: - name: security-doc - github-org: openstack - node: 'bare-precise || bare-trusty' - - jobs: - - openstack-doc-jobs - - '{name}-tox-doc-{envlist}': - envlist: publishdocs - - manual-translation-jobs - - security-doc-{lang}: - lang: ja - diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml index 1c4398c16e..243a253fff 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml @@ -104,3 +104,5 @@ - '{name}-manuals-propose-translation-update' - 'gate-{name}-tox-{envlist}': envlist: checklang + - '{name}-tox-doc-{envlist}': + envlist: publishlang diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 6f93fc416a..05a4c54549 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -336,6 +336,7 @@ project-templates: - 'gate-{name}-tox-checklang' post: - '{name}-manuals-upstream-translation-update' + - '{name}-tox-doc-publishlang' periodic: - '{name}-manuals-propose-translation-update' @@ -524,9 +525,7 @@ jobs: # Continous publishing from master of the following documentation targets: - name: ^.*manuals-upstream-translation-update$ branch: master - - name: openstack-install-deploy-guide-ja - branch: master - - name: openstack-misc-guides-ja + - name: ^.*-tox-doc-publishlang$ branch: master - name: gate-openstack-manuals-tox-checkniceness voting: false @@ -2367,10 +2366,6 @@ projects: - api-site-tox-doc-publishdocs - openstack-api-site - openstack-api-ref - - api-site-tox-buildlang-de - - api-site-tox-buildlang-es - - api-site-tox-buildlang-fr - - api-site-tox-buildlang-ja - name: openstack/docs-specs check: @@ -2386,8 +2381,6 @@ projects: - name: openstack-doc-translation post: - openstack-manuals-tox-doc-publishdocs - - openstack-install-deploy-guide-ja - - openstack-misc-guides-ja - name: openstack/operations-guide template: @@ -2395,7 +2388,6 @@ projects: - name: openstack-doc-translation post: - operations-guide-tox-doc-publishdocs - - openstack-operations-guide-ja - name: openstack/openstack-security-notes check: @@ -2409,7 +2401,6 @@ projects: - name: openstack-doc-translation post: - security-doc-tox-doc-publishdocs - - security-doc-ja # Section: OpenStack development projects