Fix commit msg to version correctly on bump

[releng/builder.git] / jjb / autorelease / version-bump.sh

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index 7d81b33a24929ef7a53ff149ac14ad594bef943f..12e1b849b3c50c378e53802cad12b3e9ea9d91b2 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -26,6 +26,8 @@ BRANCH="$GERRIT_BRANCH"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
+pip install --user --quiet --upgrade git-review
+
 # Fail if branch cutting is not on master
 if [ "$BRANCH_CUT" = "true" ] && [ "$BRANCH" != "master" ]; then
     echo "ERROR: Cannot branch cut on $BRANCH, its required to be on the master branch."
@@ -43,8 +45,7 @@ if [ "$BRANCH_CUT" = "false" ]; then
     done
 fi
 
-
-# Setup Gerrit remove to ensure Change-Id gets set on commit.
+# Setup Gerrit remote to ensure Change-Id gets set on commit.
 git config --global --add gitreview.username "jenkins-$SILO"
 git review -s
 git remote -v
@@ -55,15 +56,18 @@ 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"
 
 # Ignore changes to Final distribution since that will be released separately
-pushd integration/distribution || exit 1
-    git checkout -f opendaylight/pom.xml
-popd || exit 1
+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