Merge translation proposal scripts
Merge jenkins/scripts/propose_translation_update_django_openstack_auth.sh, jenkins/scripts/propose_translation_update_horizon.sh, and jenkins/scripts/propose_translation_update_manuals.sh into jenkins/scripts/propose_translation_update.sh. Update Jenkins and Zuul files, we can use now the same job in all cases. Change-Id: Idb9e8534dfc0454d75fe186e1a4a454832c8fdae
This commit is contained in:
Andreas Jaeger
parent
038c3cc82e
commit
4dc0ca560e
@ -440,7 +440,7 @@
|
||||
- python-kilo-bitrot-jobs
|
||||
- openstack-publish-jobs
|
||||
- javascript-jobs
|
||||
- '{name}-upstream-translation-update'
|
||||
- translation-jobs
|
||||
- gate-{name}-tox-{envlist}:
|
||||
envlist: py27dj18
|
||||
|
||||
@ -2503,7 +2503,7 @@
|
||||
- openstack-publish-jobs
|
||||
- pypi-jobs
|
||||
- 'lib-forward-testing-{name}'
|
||||
- '{name}-upstream-translation-update'
|
||||
- translation-jobs
|
||||
|
||||
- project:
|
||||
name: django-openstack-auth-kerberos
|
||||
|
||||
@ -31,57 +31,6 @@
|
||||
|
||||
node: 'proposal'
|
||||
|
||||
- job:
|
||||
name: 'django_openstack_auth-propose-translation-update'
|
||||
|
||||
builders:
|
||||
- revoke-sudo
|
||||
- branch-git-prep:
|
||||
branch: master
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
/usr/local/jenkins/slave_scripts/propose_translation_update_django_openstack_auth.sh
|
||||
|
||||
publishers:
|
||||
- console-log
|
||||
- proposal-slave-cleanup
|
||||
|
||||
node: 'proposal'
|
||||
|
||||
- job:
|
||||
name: 'horizon-propose-translation-update'
|
||||
|
||||
builders:
|
||||
- revoke-sudo
|
||||
- branch-git-prep:
|
||||
branch: master
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
/usr/local/jenkins/slave_scripts/propose_translation_update_horizon.sh
|
||||
|
||||
publishers:
|
||||
- console-log
|
||||
- proposal-slave-cleanup
|
||||
|
||||
node: 'proposal'
|
||||
|
||||
- job-template:
|
||||
name: '{name}-manuals-propose-translation-update'
|
||||
|
||||
builders:
|
||||
- revoke-sudo
|
||||
- branch-git-prep:
|
||||
branch: master
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
/usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
|
||||
|
||||
publishers:
|
||||
- console-log
|
||||
- proposal-slave-cleanup
|
||||
|
||||
node: 'proposal'
|
||||
|
||||
- job-group:
|
||||
name: translation-jobs
|
||||
jobs:
|
||||
@ -92,7 +41,7 @@
|
||||
name: manual-translation-jobs
|
||||
jobs:
|
||||
- '{name}-upstream-translation-update'
|
||||
- '{name}-manuals-propose-translation-update'
|
||||
- '{name}-propose-translation-update'
|
||||
- 'gate-{name}-tox-{envlist}':
|
||||
envlist: checklang
|
||||
- '{name}-tox-doc-{envlist}':
|
||||
|
||||
@ -16,66 +16,169 @@ PROJECT=$1
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/common_translation_update.sh
|
||||
|
||||
# Propose updates for manuals
|
||||
function propose_manuals {
|
||||
|
||||
# Pull updated translations from Zanata.
|
||||
pull_from_zanata_manuals "$PROJECT"
|
||||
|
||||
# Compress downloaded po files
|
||||
# Only touch glossary in openstack-manuals but not in any other
|
||||
# repository.
|
||||
case "$PROJECT" in
|
||||
openstack-manuals)
|
||||
compress_manual_po_files "doc" 1
|
||||
;;
|
||||
api-site)
|
||||
compress_manual_po_files "api-ref-guides" 0
|
||||
compress_manual_po_files "api-quick-start" 0
|
||||
compress_manual_po_files "api-ref" 0
|
||||
compress_manual_po_files "openstack-firstapp" 0
|
||||
;;
|
||||
ha-guide|operations-guide)
|
||||
compress_manual_po_files "doc" 0
|
||||
;;
|
||||
security-doc)
|
||||
compress_manual_po_files "security-guide" 0
|
||||
;;
|
||||
esac
|
||||
|
||||
# Add imported upstream translations to git
|
||||
for FILE in ${DocFolder}/*; do
|
||||
DOCNAME=${FILE#${DocFolder}/}
|
||||
if [ -d ${DocFolder}/${DOCNAME}/locale ] ; then
|
||||
git add ${DocFolder}/${DOCNAME}/locale/*
|
||||
fi
|
||||
if [ -d ${DocFolder}/${DOCNAME}/source/locale ] ; then
|
||||
git add ${DocFolder}/${DOCNAME}/source/locale/*
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
function update_po_files {
|
||||
|
||||
DIRECTORY=$1
|
||||
|
||||
# Update existing translation files with extracted messages.
|
||||
PO_FILES=$(find ${DIRECTORY}/locale -name "${PROJECT}.po")
|
||||
if [ -n "$PO_FILES" ]; then
|
||||
# Use updated .pot file to update translations
|
||||
python setup.py $QUIET update_catalog \
|
||||
--no-fuzzy-matching --ignore-obsolete=true
|
||||
fi
|
||||
}
|
||||
|
||||
# Propose updates for python projects
|
||||
function propose_python {
|
||||
|
||||
# Pull updated translations from Zanata
|
||||
pull_from_zanata
|
||||
|
||||
# Extract all messages from project, including log messages.
|
||||
extract_messages_log "$PROJECT"
|
||||
|
||||
update_po_files "$PROJECT"
|
||||
# We cannot run update_catalog for the log files, since there is no
|
||||
# option to specify the keyword and thus an update_catalog run would
|
||||
# add the messages with the default keywords. Therefore use msgmerge
|
||||
# directly.
|
||||
for level in $LEVELS ; do
|
||||
PO_FILES=$(find ${PROJECT}/locale -name "${PROJECT}-log-${level}.po")
|
||||
if [ -n "$PO_FILES" ]; then
|
||||
for f in $PO_FILES ; do
|
||||
echo "Updating $f"
|
||||
msgmerge --update --no-fuzzy-matching $f \
|
||||
--backup=none \
|
||||
${PROJECT}/locale/${PROJECT}-log-${level}.pot
|
||||
# Remove obsolete entries
|
||||
msgattrib --no-obsolete --force-po \
|
||||
--output-file=${f}.tmp ${f}
|
||||
mv ${f}.tmp ${f}
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# Now add all changed files to git.
|
||||
# Note we add them here to not have to differentiate in the functions
|
||||
# between new files and files already under git control.
|
||||
git add $PROJECT/locale/*
|
||||
|
||||
# Remove obsolete files.
|
||||
cleanup_po_files "$PROJECT"
|
||||
|
||||
# Compress downloaded po files, this needs to be done after
|
||||
# cleanup_po_files since that function needs to have information the
|
||||
# number of untranslated strings.
|
||||
compress_po_files "$PROJECT"
|
||||
|
||||
# Some files were changed, add changed files again to git, so that we
|
||||
# can run git diff properly.
|
||||
git add $PROJECT/locale/*
|
||||
}
|
||||
|
||||
function propose_horizon {
|
||||
|
||||
# Pull updated translations from Zanata.
|
||||
pull_from_zanata
|
||||
|
||||
# Invoke run_tests.sh to update the po files
|
||||
# Or else, "../manage.py makemessages" can be used.
|
||||
./run_tests.sh --makemessages -V
|
||||
|
||||
# Compress downloaded po files
|
||||
compress_po_files "horizon"
|
||||
compress_po_files "openstack_dashboard"
|
||||
|
||||
# Add all changed files to git
|
||||
git add horizon/locale/* openstack_dashboard/locale/*
|
||||
}
|
||||
|
||||
function propose_django_openstack_auth {
|
||||
|
||||
# Pull updated translations from Zanata.
|
||||
pull_from_zanata
|
||||
|
||||
# Update the .pot file
|
||||
python setup.py extract_messages
|
||||
|
||||
update_po_files "openstack_auth"
|
||||
|
||||
# Compress downloaded po files
|
||||
compress_po_files "openstack_auth"
|
||||
|
||||
# Add all changed files to git
|
||||
git add openstack_auth/locale/*
|
||||
}
|
||||
|
||||
# Setup git repository for git review.
|
||||
setup_git
|
||||
|
||||
# Check whether a review already exists, setup review commit message.
|
||||
setup_review
|
||||
# Project specific setup.
|
||||
setup_project "$PROJECT"
|
||||
|
||||
# Setup some global vars which will be used in the rest of the script.
|
||||
setup_loglevel_vars
|
||||
|
||||
# Pull updated translations from Zanata
|
||||
pull_from_zanata
|
||||
|
||||
# Extract all messages from project, including log messages.
|
||||
extract_messages_log "$PROJECT"
|
||||
|
||||
# Update existing translation files with extracted messages.
|
||||
PO_FILES=$(find ${PROJECT}/locale -name "${PROJECT}.po")
|
||||
if [ -n "$PO_FILES" ]; then
|
||||
# Use updated .pot file to update translations
|
||||
python setup.py $QUIET update_catalog \
|
||||
--no-fuzzy-matching --ignore-obsolete=true
|
||||
fi
|
||||
# We cannot run update_catalog for the log files, since there is no
|
||||
# option to specify the keyword and thus an update_catalog run would
|
||||
# add the messages with the default keywords. Therefore use msgmerge
|
||||
# directly.
|
||||
for level in $LEVELS ; do
|
||||
PO_FILES=$(find ${PROJECT}/locale -name "${PROJECT}-log-${level}.po")
|
||||
if [ -n "$PO_FILES" ]; then
|
||||
for f in $PO_FILES ; do
|
||||
echo "Updating $f"
|
||||
msgmerge --update --no-fuzzy-matching $f \
|
||||
--backup=none \
|
||||
${PROJECT}/locale/${PROJECT}-log-${level}.pot
|
||||
# Remove obsolete entries
|
||||
msgattrib --no-obsolete --force-po \
|
||||
--output-file=${f}.tmp ${f}
|
||||
mv ${f}.tmp ${f}
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# Now add all changed files to git.
|
||||
# Note we add them here to not have to differentiate in the functions
|
||||
# between new files and files already under git control.
|
||||
git add $PROJECT/locale/*
|
||||
|
||||
# Remove obsolete files.
|
||||
cleanup_po_files "$PROJECT"
|
||||
|
||||
# Compress downloaded po files, this needs to be done after
|
||||
# cleanup_po_files since that function needs to have information the
|
||||
# number of untranslated strings.
|
||||
compress_po_files "$PROJECT"
|
||||
|
||||
# Some files were changed, add changed files again to git, so that we
|
||||
# can run git diff properly.
|
||||
git add $PROJECT/locale/*
|
||||
case "$PROJECT" in
|
||||
api-site|ha-guide|openstack-manuals|operations-guide|security-doc)
|
||||
init_manuals "$PROJECT"
|
||||
setup_manuals "$PROJECT"
|
||||
propose_manuals
|
||||
;;
|
||||
django_openstack_auth)
|
||||
setup_django_openstack_auth
|
||||
propose_django_openstack_auth
|
||||
;;
|
||||
horizon)
|
||||
setup_horizon
|
||||
propose_horizon
|
||||
;;
|
||||
*)
|
||||
# Project specific setup.
|
||||
setup_project "$PROJECT"
|
||||
# Setup some global vars which will be used in the rest of the
|
||||
# script.
|
||||
setup_loglevel_vars
|
||||
propose_python
|
||||
;;
|
||||
esac
|
||||
|
||||
# Filter out commits we do not want.
|
||||
filter_commits
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
#!/bin/bash -xe
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/common_translation_update.sh
|
||||
|
||||
setup_git
|
||||
|
||||
setup_review
|
||||
|
||||
setup_django_openstack_auth
|
||||
|
||||
# Pull updated translations from Zanata.
|
||||
pull_from_zanata
|
||||
|
||||
# Update the .pot file
|
||||
python setup.py extract_messages
|
||||
PO_FILES=$(find openstack_auth/locale -name '*.po')
|
||||
if [ -n "$PO_FILES" ]; then
|
||||
# Use updated .pot file to update translations
|
||||
python setup.py update_catalog --no-fuzzy-matching --ignore-obsolete=true
|
||||
fi
|
||||
|
||||
# Compress downloaded po files
|
||||
compress_po_files "openstack_auth"
|
||||
|
||||
# Add all changed files to git
|
||||
git add openstack_auth/locale/*
|
||||
|
||||
filter_commits
|
||||
|
||||
send_patch
|
||||
@ -1,38 +0,0 @@
|
||||
#!/bin/bash -xe
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/common_translation_update.sh
|
||||
|
||||
setup_git
|
||||
|
||||
setup_review
|
||||
setup_horizon
|
||||
|
||||
# Pull updated translations from Zanata.
|
||||
pull_from_zanata
|
||||
|
||||
# Invoke run_tests.sh to update the po files
|
||||
# Or else, "../manage.py makemessages" can be used.
|
||||
./run_tests.sh --makemessages -V
|
||||
|
||||
# Compress downloaded po files
|
||||
compress_po_files "horizon"
|
||||
compress_po_files "openstack_dashboard"
|
||||
|
||||
# Add all changed files to git
|
||||
git add horizon/locale/* openstack_dashboard/locale/*
|
||||
|
||||
filter_commits
|
||||
|
||||
send_patch
|
||||
@ -1,68 +0,0 @@
|
||||
#!/bin/bash -xe
|
||||
|
||||
# Copyright 2013 IBM Corp.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# The script is to pull the translations from OpenStack's Zanata server,
|
||||
# and push to Gerrit.
|
||||
|
||||
PROJECT=$1
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/common_translation_update.sh
|
||||
|
||||
init_manuals "$PROJECT"
|
||||
|
||||
setup_git
|
||||
setup_review
|
||||
|
||||
setup_manuals "$PROJECT"
|
||||
|
||||
# Pull updated translations from Zanata.
|
||||
pull_from_zanata_manuals "$PROJECT"
|
||||
|
||||
# Compress downloaded po files
|
||||
# Only touch glossary in openstack-manuals but not in any other
|
||||
# repository.
|
||||
case "$project" in
|
||||
openstack-manuals)
|
||||
compress_manual_po_files "doc" 1
|
||||
;;
|
||||
api-site)
|
||||
compress_manual_po_files "api-ref-guides" 0
|
||||
compress_manual_po_files "api-quick-start" 0
|
||||
compress_manual_po_files "api-ref" 0
|
||||
compress_manual_po_files "openstack-firstapp" 0
|
||||
;;
|
||||
ha-guide|operations-guide)
|
||||
compress_manual_po_files "doc" 0
|
||||
;;
|
||||
security-doc)
|
||||
compress_manual_po_files "security-guide" 0
|
||||
;;
|
||||
esac
|
||||
|
||||
# Add imported upstream translations to git
|
||||
for FILE in ${DocFolder}/*; do
|
||||
DOCNAME=${FILE#${DocFolder}/}
|
||||
if [ -d ${DocFolder}/${DOCNAME}/locale ] ; then
|
||||
git add ${DocFolder}/${DOCNAME}/locale/*
|
||||
fi
|
||||
if [ -d ${DocFolder}/${DOCNAME}/source/locale ] ; then
|
||||
git add ${DocFolder}/${DOCNAME}/source/locale/*
|
||||
fi
|
||||
done
|
||||
|
||||
filter_commits
|
||||
|
||||
send_patch
|
||||
@ -393,7 +393,7 @@ project-templates:
|
||||
- '{name}-upstream-translation-update'
|
||||
- '{name}-tox-doc-publishlang'
|
||||
periodic:
|
||||
- '{name}-manuals-propose-translation-update'
|
||||
- '{name}-propose-translation-update'
|
||||
|
||||
- name: translation-jobs
|
||||
post:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user