From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 8 Jun 2016 21:26:27 +0000 (-0400)
Subject: Update bumping script to merge from git bundles
X-Git-Tag: v0.0.6~40
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=9151a1463a9f7af6c3e3c205e0c98f3cbf1de0c7;p=releng%2Flftools.git

Update bumping script to merge from git bundles

Change-Id: Ia44a4e037eb218eda0be4ebcbf8f946704c9f0de
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/patch-odl-release.sh b/patch-odl-release.sh
index 7edf9cb6..ed26cff3 100755
--- a/patch-odl-release.sh
+++ b/patch-odl-release.sh
@@ -54,13 +54,17 @@ then
     exit 1
 fi
 
+
 #######################
 # Start apply patches #
 #######################
-git apply ${PATCH_DIR}/${project/\//-}.patch
-git commit -asm "Release $RELEASE_TAG"
+git fetch ${PATCH_DIR}/${project/\//-}.bundle
+git merge FETCH_HEAD
 git tag -asm "OpenDaylight $RELEASE_TAG release" release/${RELEASE_TAG,,}
 find . -name pom.xml | xargs grep SNAPSHOT
+
 $scriptdir/version.sh bump $RELEASE_TAG
 git commit -asm "Bumping versions by 0.0.1 for next dev cycle"
 find . -name pom.xml | xargs grep $RELEASE_TAG
+
+echo "Tagging and version bumping complete"