X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fversion-bump.sh;h=12e1b849b3c50c378e53802cad12b3e9ea9d91b2;hb=6bfc1211fbafcae3ec17466f94474ac726235bd2;hp=fc7e0466a15b48f354dfb8d2a8399f6454ca63a4;hpb=af487d68f24c9f19ec9a1113203a649f33f2f169;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index fc7e0466a..12e1b849b 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.
@@ -16,6 +16,7 @@ echo "---> version-bump.sh"
 # The only purpose of RELEASE_TAG in this script is to set the Gerrit topic.
 # It is also used as a placeholder for version bumping but gets wiped out
 # immediately to bump versions by x.y.(z+1).
+TOPIC="${RELEASE_TAG}"
 RELEASE_TAG="${STREAM^}"
 
 mkdir -p "$WORKSPACE/archives"
@@ -25,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."
@@ -34,21 +37,15 @@ fi
 if [ "$BRANCH_CUT" = "false" ]; then
     git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
 
-    # TODO: Simplify once stable/nitrogen is no longer supported.
     for module in $(git submodule | awk '{ print $2 }')
     do
         pushd "$module"
-        if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-            git checkout -b "v1.2.x" "origin/v1.2.x"
-        else
-            git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
-        fi
+        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
         popd
     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
@@ -59,10 +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"
 
-git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
+# 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 '${commit_msg}'"
 # Only submodules need to be bumped, we can ignore autorelease's bump information
 git checkout -f
 
@@ -72,14 +77,8 @@ mkdir -p "$patch_dir"
 for module in $(git submodule | awk '{ print $2 }')
 do
     pushd "$module"
-    # TODO: Remove once stable/nitrogen is no longer supported.
-    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-        git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch"
-        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD"
-    else
-        git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
-        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
-    fi
+    git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     popd
 done
 
@@ -131,7 +130,7 @@ git submodule foreach git checkout -f
 if [ "$DRY_RUN" = "false" ]
 then
     # Push up patches last, as long as nothing failed.
-    git submodule foreach git review --yes -t "${RELEASE_TAG}"
+    git submodule foreach git review --yes -t "${TOPIC}"
 fi
 
 echo "Version bumping complete."