Fix manuals translation jobs

Currently the periodic job manuals-propose-translation-update runs
three times on the same repository instead of running once each for
api-site, openstack-manuals and operations-guide.

Also, manuals-upstream-translation-update does not handle the api-site
repo.

* Change the scripts so that they handle all three repositories.
* Update the jenkins configuration to call the scripts with repository name
  as parameter. This needs new job-templates.
* Create a job-group
* Use job-group for each repository.
* Adjust Zuul for new jobs using a template.
* Update manual jobs in zuul to check for just "master" as branch
  instead of using a regex.

Change-Id: I755730ea43ad05a373704ab2fb7e5b55f1c8aeee
Closes-Bug: #1291844
This commit is contained in:
Andreas Jaeger 2014-03-14 09:41:11 +01:00
parent c66446aa33
commit a77f69cacb
5 changed files with 46 additions and 38 deletions

View File

@ -17,8 +17,12 @@
# The script is to pull the translations from Transifex,
# and push to Gerrit.
PROJECT="openstack-manuals"
PROJECT=$1
DocFolder="doc"
if [ $PROJECT = "api-site" ] ; then
DocFolder="./"
fi
COMMIT_MSG="Imported Translations from Transifex"

View File

@ -16,7 +16,12 @@
# The script is to push the updated PoT to Transifex.
PROJECT=$1
DocFolder="doc"
if [ $PROJECT = "api-site" ] ; then
DocFolder="./"
fi
if [ ! `echo $ZUUL_REFNAME | grep master` ]
then
@ -62,6 +67,3 @@ then
# Push .pot changes to transifex
tx --debug --traceback push -s
fi

View File

@ -1983,6 +1983,7 @@
jobs:
- openstack-doc-jobs
- manual-translation-jobs
- 'openstack-{manual}'
@ -2045,6 +2046,7 @@
jobs:
- openstack-doc-jobs
- manual-translation-jobs
- project:
name: manila
@ -2217,10 +2219,10 @@
jobs:
- openstack-doc-jobs
- manual-translation-jobs
- '{name}-tox-doc-{envlist}':
envlist: publishdocs
- project:
name: database-api
github-org: openstack

View File

@ -45,37 +45,31 @@
node: 'proposal'
- job:
name: manuals-upstream-translation-update
- job-template:
name: '{name}-manuals-upstream-translation-update'
builders:
- gerrit-git-prep
- shell: |
#!/bin/bash -xe
/usr/local/jenkins/slave_scripts/upstream_translation_update_manuals.sh
/usr/local/jenkins/slave_scripts/upstream_translation_update_manuals.sh {name}
publishers:
- console-log
node: 'proposal'
- job:
name: manuals-propose-translation-update
- job-template:
name: '{name}-manuals-propose-translation-update'
builders:
- shell: |
#!/bin/bash -xe
/usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh
/usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
publishers:
- console-log
scm:
- git:
url: 'git://git.openstack.org/openstack/openstack-manuals'
branches:
- 'origin/master'
node: 'proposal'
- job-group:
@ -84,3 +78,8 @@
- '{name}-upstream-translation-update'
- '{name}-propose-translation-update'
- job-group:
name: manual-translation-jobs
jobs:
- '{name}-manuals-upstream-translation-update'
- '{name}-manuals-propose-translation-update'

View File

@ -294,6 +294,11 @@ project-templates:
- gate-{name}-tox-checkdeletions
- gate-{name}-tox-doc-publish-checkbuild
- name: openstack-doc-translation
post:
- '{name}-manuals-upstream-translation-update'
periodic:
- '{name}-manuals-propose-translation-update'
jobs:
- name: ^.*$
@ -410,25 +415,29 @@ jobs:
success-message: Jenkins XML output is unchanged.
# Continous publishing from master of the following documentation targets:
- name: openstack-admin-guide-cloud
branch: ^master$
branch: master
- name: openstack-docs-site
branch: ^master$
branch: master
- name: openstack-cli-reference
branch: ^master$
branch: master
- name: openstack-glossary
branch: ^master$
branch: master
- name: openstack-ha-guide
branch: ^master$
branch: master
- name: openstack-image-guide
branch: ^master$
branch: master
- name: openstack-user-guide
branch: ^master$
branch: master
- name: openstack-user-guide-admin
branch: ^master$
branch: master
- name: openstack-security-guide
branch: ^master$
branch: master
- name: openstack-training-guides
branch: ^master$
branch: master
- name: ^.*manuals-propose-translation-update$
branch: master
- name: ^.*manuals-upstream-translation-update$
branch: master
# Documentation targets for master and future stable branches:
- name: openstack-config-reference
branch: ^(?!stable/grizzly).*$
@ -490,8 +499,6 @@ jobs:
branch: ^(?!stable/grizzly).*$
- name: ^gate-requirements-(python27|pypy)$
branch: ^(?!stable/grizzly).*$
- name: manuals-upstream-translation-update
branch: ^master$
- name: gate-hacking-python33
voting: false
- name: gate-hacking-pypy
@ -2280,17 +2287,16 @@ projects:
- name: openstack/api-site
template:
- name: openstack-doc-gate
- name: openstack-doc-translation
post:
- api-site-tox-doc-publishdocs
- openstack-api-site
- openstack-api-ref
- manuals-upstream-translation-update
periodic:
- manuals-propose-translation-update
- name: openstack/openstack-manuals
template:
- name: openstack-doc-gate
- name: openstack-doc-translation
check:
- gate-openstack-manuals-validate
gate:
@ -2319,20 +2325,15 @@ projects:
- openstack-security-guide
- openstack-user-guide
- openstack-user-guide-admin
- manuals-upstream-translation-update
- openstack-training-guides
periodic:
- manuals-propose-translation-update
- name: openstack/operations-guide
template:
- name: openstack-doc-gate
- name: openstack-doc-translation
post:
- openstack-operations-guide
- openstack-operations-guide-ja
- manuals-upstream-translation-update
periodic:
- manuals-propose-translation-update
# Section: OpenStack development projects