diff options
author | deepshikhaaa <deepshikhakhandelwal8@gmail.com> | 2017-10-11 15:46:17 +0530 |
---|---|---|
committer | deepshikhaaa <deepshikhakhandelwal8@gmail.com> | 2017-10-11 17:17:42 +0530 |
commit | 4e2fd50bd4b1295b5dcd49a1fa9b49abbad9dcc7 (patch) | |
tree | 3cdb26ce5983c4cfbccf1b44212a2f0f2d32c174 | |
parent | d6c6f44ab6040f3dc60cd50787b34be2f34507a6 (diff) |
Few changes in the bugzilla-post job
Change-Id: I9e753a12f9ed3a98232914dea1833e441743347b
-rw-r--r-- | build-gluster-org/jobs/bugzilla-post.yml | 4 | ||||
-rw-r--r-- | build-gluster-org/scripts/bugzilla-post.sh | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/build-gluster-org/jobs/bugzilla-post.yml b/build-gluster-org/jobs/bugzilla-post.yml index b337f8f..e64cd9f 100644 --- a/build-gluster-org/jobs/bugzilla-post.yml +++ b/build-gluster-org/jobs/bugzilla-post.yml @@ -36,10 +36,6 @@ default: master description: 'Name of the branch you want to build from. We usually build from master' name: GERRIT_BRANCH - - string: - default: 'true' - description: 'A parameter named DRY_RUN, defaults to true' - name: DRY_RUN builders: - shell: !include-raw: ../scripts/bugzilla-post.sh diff --git a/build-gluster-org/scripts/bugzilla-post.sh b/build-gluster-org/scripts/bugzilla-post.sh index 2913a5e..27a10a9 100644 --- a/build-gluster-org/scripts/bugzilla-post.sh +++ b/build-gluster-org/scripts/bugzilla-post.sh @@ -4,7 +4,7 @@ function commit_message_edited() { if [ "$GERRIT_PATCHSET_NUMBER" != "1" ]; then OLD_PATCHSET_NUM="$(($GERRIT_PATCHSET_NUMBER-1))" - old_bugid=$(curl -X GET https://review.gluster.org/changes/${GERRIT_PROJECT}~${GERRIT_BRANCH}~${GERRIT_CHANGE_ID}/revisions/$OLD_PATCHSET_NUM/commit | grep message | awk -F'"' '{print $4}' | sed 's/\\n/\'$'\n''/g' | grep -i '^bug: ' | awk '{print $2}') + old_bugid=$(curl -X GET https://review.gluster.org/changes/${GERRIT_PROJECT}~${GERRIT_BRANCH}~${GERRIT_CHANGE_ID}/revisions/$OLD_PATCHSET_NUM/commit | grep message | sed 's/\\n/\'$'\n''/g' | grep -i '^bug: ' | awk '{print $2}') if [ "$bugid" == "$old_bugid" ]; then exit 0 fi @@ -28,7 +28,8 @@ function update_bugzilla() run bugzilla modify $bugid --comment="REVIEW: $GERRIT_CHANGE_URL ($GERRIT_CHANGE_SUBJECT) posted (#$GERRIT_PATCHSET_NUMBER) for review on $GERRIT_BRANCH by $GERRIT_PATCHSET_UPLOADER_NAME"; else commit_message_edited; - run bugzilla modify $bugid --comment="REVISION POSTED: $GERRIT_CHANGE_URL ($GERRIT_CHANGE_SUBJECT) posted (#$GERRIT_PATCHSET_NUMBER) for review on $GERRIT_BRANCH by $GERRIT_PATCHSET_UPLOADER_NAME"; + run bugzilla modify $old_bugid --comment="REVISION POSTED: $GERRIT_CHANGE_URL ($GERRIT_CHANGE_SUBJECT) posted (#$GERRIT_PATCHSET_NUMBER) for review on $GERRIT_BRANCH by $GERRIT_PATCHSET_UPLOADER_NAME"; + run bugzilla modify $bugid --comment="REVIEW: $GERRIT_CHANGE_URL ($GERRIT_CHANGE_SUBJECT) posted (#$GERRIT_PATCHSET_NUMBER) for review on $GERRIT_BRANCH by $GERRIT_PATCHSET_UPLOADER_NAME"; fi else run bugzilla modify $bugid --comment="COMMIT: $GERRIT_CHANGE_URL committed in $GERRIT_BRANCH by $GERRIT_SUBMITTER $(echo; echo -------------; echo;) $(echo $GERRIT_CHANGE_COMMIT_MESSAGE | base64 -d)"; @@ -44,7 +45,6 @@ function run() fi } - function main() { if [ "$GERRIT_PROJECT" != "glusterfs" ]; then |