Ignore intg/dist/opendaylight in version bump

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

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index d48b49070ed71a29109f688d0d8818a442577320..a4844be2662f65a8e58b5c2d57b148db39c97b8e 100644 (file)
--- 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.
@@ -58,6 +58,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