opendev/system-config
Code Issues Proposed changes

Propose translations based on master.

Browse Source 
Previously if an existing transifex translation change was present the
translation proposal script would make changes against that change.
git-review would break and this ends up not actually proposing changes
that we want. To correct this get the change id of the existing change
and use that in the commit message for changes based off of master. This
gives us translations based on the latest code with the benefits of less
noise in gerrit.

Change-Id: I88bf13193c6541806388dd610c68e0a95205973e
Reviewed-on: https://review.openstack.org/13233
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-09-18 14:29:22 -07:00 committed by Jenkins
parent cfa1be910f
commit cf9895ea31
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/jenkins/files/slave_scripts/propose_translation_update.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash -xe #!/bin/bash -xe
PROJECT=$1 PROJECT=$1
COMMIT_MSG="Imported Translations from Transifex"
git config user.name "OpenStack Jenkins" git config user.name "OpenStack Jenkins"
git config user.email "jenkins@openstack.org" git config user.email "jenkins@openstack.org"
@ -9,11 +10,16 @@ git config gitreview.username "jenkins"
git review -s git review -s
# See if there is an open change in the transifex/translations topic # See if there is an open change in the transifex/translations topic
# If so, amend the commit with new changes since then # If so, get the change id for the existing change for use in the commit msg.
previous=`ssh -p 29418 review.openstack.org gerrit query --current-patch-set status:open project:openstack/$PROJECT topic:transifex/translations | grep "^ number:" | awk '{print $2}'` change_info=`ssh -p 29418 review.openstack.org gerrit query --current-patch-set status:open project:openstack/$PROJECT topic:transifex/translations owner:jenkins`
previous=`echo "$change_info" | grep "^ number:" | awk '{print $2}'`
if [ "x${previous}" != "x" ] ; then if [ "x${previous}" != "x" ] ; then
git review -d ${previous} change_id=`echo "$change_info" | grep "^change" | awk '{print $2}'`
amend="--amend" read -d '' COMMIT_MSG <<EOF
Imported Translations from Transifex
Change-Id: $change_id
EOF
fi fi
# initialize transifex client # initialize transifex client
@ -32,7 +38,9 @@ git add $PROJECT/locale/*
if [ ! `git diff-index --quiet HEAD --` ] if [ ! `git diff-index --quiet HEAD --` ]
then then
# Commit and review # Commit and review
git commit ${amend} -m "Imported Translations from Transifex" git commit -F- <<EOF
$COMMIT_MSG
EOF
git review -t transifex/translations git review -t transifex/translations
# Push changes to transifex # Push changes to transifex