From: Thanh Ha <zxiiro@gmail.com>
Date: Tue, 11 Aug 2020 18:28:32 +0000 (-0400)
Subject: Fix commit msg to version correctly on bump
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=6bfc1211fbafcae3ec17466f94474ac726235bd2

Fix commit msg to version correctly on bump

When version bump when branch cutting we want to bump by x.(y+1).z
and when performing a release bump we want to bump by x.y.(z+1)
however the current code always sets the message to "Bump version by
x.y.(z+1)" regardless of what kind of bump it was.

Change-Id: Ic88946b61f9381792c5c61190530d5d8b35e03ee
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
---

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index cbd532e59..12e1b849b 100644
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -56,6 +56,9 @@ git status
 
 if [ "$BRANCH_CUT" = "false" ]; then
     lftools version release "$RELEASE_TAG"
+    commit_msg="Bump versions by x.y.(z+1)"
+else
+    commit_msg="Bump versions by x.(y+1).z"
 fi
 lftools version bump "$RELEASE_TAG"
 
@@ -64,7 +67,7 @@ pushd integration/distribution || true
     git checkout -f opendaylight/pom.xml || true
 popd || true
 
-git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
+git submodule foreach "git commit -asm '${commit_msg}'"
 # Only submodules need to be bumped, we can ignore autorelease's bump information
 git checkout -f