From 7d018cc4b4a320c2309d0f9fa7d763904b64e925 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 20 Sep 2012 10:21:31 -0700 Subject: [PATCH] Push src and tx files to transifex separately. Push the source (.pot) file independently of the translation (.po) files so that we can disable set -e when pushing the .po files. Previously pushing the .po files would fail the entire test if one of the pushed files contained no translations. This would also prevent other translation files from being pushed. Now push the .pot file separately so that a failure pushing that file still fails the test, but errors pushing the translation files can be ignored. Also add the --skip option to the translation push which will allow all valid translations to be pushed even if some fail. Change-Id: I8958c29113ce5d21a0b281ee13abe94d477fb04c Reviewed-on: https://review.openstack.org/13385 Reviewed-by: James E. Blair Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- .../files/slave_scripts/propose_translation_update.sh | 11 +++++++++-- .../slave_scripts/upstream_translation_update.sh | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh index a37965edf7..ddda4d54df 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh @@ -48,6 +48,13 @@ $COMMIT_MSG EOF git review -t transifex/translations - # Push changes to transifex - tx --debug --traceback push -st + # Push .pot changes to transifex + tx --debug --traceback push -s + # Push translation changes to transifex + # Disable -e as we can live with failed translation pushes (failures + # occur when a translation file has no translations in it not really + # error worthy but they occur) + set +e + tx --debug --traceback push -t --skip + set -e fi diff --git a/modules/jenkins/files/slave_scripts/upstream_translation_update.sh b/modules/jenkins/files/slave_scripts/upstream_translation_update.sh index a6db9f223a..24c59465fb 100755 --- a/modules/jenkins/files/slave_scripts/upstream_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/upstream_translation_update.sh @@ -25,6 +25,13 @@ git add $PROJECT/locale/* if [ ! `git diff-index --quiet HEAD --` ] then - # Push changes to transifex - tx --debug --traceback push -st + # Push .pot changes to transifex + tx --debug --traceback push -s + # Push translation changes to transifex + # Disable -e as we can live with failed translation pushes (failures + # occur when a translation file has no translations in it not really + # error worthy but they occur) + set +e + tx --debug --traceback push -t --skip + set -e fi