From 94c43aa551a7d825328668609bf62b252b53d126 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Mon, 26 Aug 2013 22:48:41 +0400
Subject: [PATCH] Translation update jobs now supports any org
Change-Id: I252efe1b741ec08fc5d5fadd3507af905c2dd1ec
---
.../files/slave_scripts/propose_translation_update.sh | 5 +++--
.../files/jenkins_job_builder/config/translation-jobs.yaml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh
index edc5506ebd..91ffa7250c 100755
--- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh
+++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh
@@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-PROJECT=$1
+ORG=$1
+PROJECT=$2
COMMIT_MSG="Imported Translations from Transifex"
git config user.name "OpenStack Jenkins"
@@ -23,7 +24,7 @@ git review -s
# See if there is an open change in the transifex/translations topic
# If so, get the change id for the existing change for use in the commit msg.
-change_info=`ssh -p 29418 review.openstack.org gerrit query --current-patch-set status:open project:openstack/$PROJECT topic:transifex/translations owner:jenkins`
+change_info=`ssh -p 29418 review.openstack.org gerrit query --current-patch-set status:open project:$ORG/$PROJECT topic:transifex/translations owner:jenkins`
previous=`echo "$change_info" | grep "^ number:" | awk '{print $2}'`
if [ "x${previous}" != "x" ] ; then
change_id=`echo "$change_info" | grep "^change" | awk '{print $2}'`
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
index 89776ea44f..9e2c2d96e5 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
@@ -20,7 +20,7 @@
builders:
- shell: |
#!/bin/bash -xe
- /usr/local/jenkins/slave_scripts/propose_translation_update.sh {name}
+ /usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
publishers:
- console-log-periodic