From c4f34c50ce7221d865fcbdc8ad71a6f06c62d42b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 30 Jun 2014 18:00:30 +0200 Subject: [PATCH] Add gating for security-doc repo The security-guide has moved from openstack-manuals repo to the security-doc repository. Add the usual manual gating jobs for the security-doc repository. The guide is translated into Japanese, so publish the Japanese document as well. This needs a new job 'security-doc-{lang}'. Add all jobs to Zuul for execution. Change also translation scripts, the security-guide document is on top-level of the repository and not below doc. Thus, we need to special case it. Change-Id: Ib267a35566d446fa13675e4c7247222916f6ffe4 --- .../jenkins_job_builder/config/manuals-jobs.yaml | 16 ++++++++++++++++ .../jenkins_job_builder/config/projects.yaml | 14 ++++++++++++++ .../slave_scripts/common_translation_update.sh | 2 +- modules/openstack_project/files/zuul/layout.yaml | 10 ++++++---- 4 files changed, 37 insertions(+), 5 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 eef439e34b..69202d9181 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 @@ -46,6 +46,22 @@ - 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-guide + tox -v -e buildlang -- {lang} + + publishers: + - console-log + - upload-to-docs-site + - job-template: name: 'gate-{name}-tox-doc-publish-{envlist}' 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 8e4f4891a6..3e14a92ba7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -2849,3 +2849,17 @@ 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/slave_scripts/common_translation_update.sh b/modules/openstack_project/files/slave_scripts/common_translation_update.sh index a83e33cee7..b6447dccaf 100644 --- a/modules/openstack_project/files/slave_scripts/common_translation_update.sh +++ b/modules/openstack_project/files/slave_scripts/common_translation_update.sh @@ -69,7 +69,7 @@ function init_manuals () project=$1 DocFolder="doc" - if [ $project = "api-site" ] ; then + if [ $project = "api-site" -o $project = "security-doc" ] ; then DocFolder="./" fi } diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 7f20ebda98..298fee5a21 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2435,10 +2435,12 @@ projects: - noop - name: openstack/security-doc - check: - - noop - gate: - - noop + template: + - name: openstack-doc-gate + - name: openstack-doc-translation + post: + - security-doc-tox-doc-publishdocs + - security-doc-ja # Section: OpenStack development projects