From: Anil Belur Date: Tue, 11 Dec 2018 22:30:07 +0000 (+1000) Subject: Ignore intg/dist/opendaylight in version bump X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=680923f728cfa255442ba6764680d83e4c1fc7ad;p=releng%2Fbuilder.git Ignore intg/dist/opendaylight in version bump The change Ic6e6bb737af9a8a3035c2ee4d4b590072073bf46 does not ignore the absense of the intg/dist dir and instead fails the version bump when the directory is not available. Instead ignore if this dir is not present since the opendaylight/pom.xml builds the common distribution (managed distribution + SM projects) for Fluorine onwards. Change-Id: Ia2c0d0ae3b9eec1491f60e8bcbce71fc61ad26cd Signed-off-by: Anil Belur --- diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index 7d81b33a2..a4844be26 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -59,9 +59,9 @@ 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)'" # Only submodules need to be bumped, we can ignore autorelease's bump information