X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fversion-bump.sh;h=23d062f4fbc1157d355bd3f25c5d3437432ce2d0;hb=7c8b67841e638bfe31b17b12b50422733f89f892;hp=d48b49070ed71a29109f688d0d8818a442577320;hpb=3c61582e088a95f1ff8935f56a6f11c765db175c;p=releng%2Fbuilder.git diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index d48b49070..23d062f4f 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. @@ -43,8 +43,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 @@ -58,6 +57,11 @@ if [ "$BRANCH_CUT" = "false" ]; then fi lftools version bump "$RELEASE_TAG" +# Ignore changes to Final distribution since that will be released separately +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)'" # Only submodules need to be bumped, we can ignore autorelease's bump information git checkout -f