X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fversion-bump.sh;h=12e1b849b3c50c378e53802cad12b3e9ea9d91b2;hb=6bfc1211fbafcae3ec17466f94474ac726235bd2;hp=23d062f4fbc1157d355bd3f25c5d3437432ce2d0;hpb=410bdc83251779f7b5ef615452b1e15350be4b58;p=releng%2Fbuilder.git diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index 23d062f4f..12e1b849b 100644 --- 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." @@ -54,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" @@ -62,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