From 8c76adbad32a1b6bfaf757a23fde938fc60ebbc7 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 15 Apr 2014 11:11:51 -0700 Subject: [PATCH] Use proposal bot username in proposal jobs. After the switch to using the proposal-bot gerrit user in proposal jobs some jobs continued to attempted to use the jenkins user. Fix that and use the proposal-bot user. Change-Id: I146b6ea29d66bd171072e6529413efcc5cae3d8d --- .../files/slave_scripts/propose_requirements_update.sh | 4 ++-- .../jenkins/files/slave_scripts/propose_translation_update.sh | 2 +- .../files/slave_scripts/propose_translation_update_manuals.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh index 5a29325470..d93e22e3e2 100755 --- a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh @@ -14,7 +14,7 @@ INITIAL_COMMIT_MSG="Updated from global requirements" TOPIC="openstack/requirements" -USERNAME=${USERNAME:-$USER} +USERNAME="proposal-bot" BRANCH=$ZUUL_REF ALL_SUCCESS=0 @@ -33,7 +33,7 @@ for PROJECT in $(cat projects.txt); do # See if there is an open change in the openstack/requirements 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:$PROJECT topic:$TOPIC owner:$USERNAME branch:$BRANCH) + change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME branch:$BRANCH) 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/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh index 509958e27a..c06772396f 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh @@ -24,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:$ORG/$PROJECT topic:transifex/translations owner:jenkins` +change_info=`ssh -p 29418 proposal-bot@review.openstack.org gerrit query --current-patch-set status:open project:$ORG/$PROJECT topic:transifex/translations owner:proposal-bot` 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/jenkins/files/slave_scripts/propose_translation_update_manuals.sh b/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh index eb7da86a94..30ae6fe390 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh @@ -34,7 +34,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 proposal-bot@review.openstack.org gerrit query --current-patch-set status:open project:openstack/$PROJECT topic:transifex/translations owner:proposal-bot` previous=`echo "$change_info" | grep "^ number:" | awk '{print $2}'` if [ "x${previous}" != "x" ] ; then change_id=`echo "$change_info" | grep "^change" | awk '{print $2}'`