X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Finclude-raw-autorelease-release-versions.sh;h=8369a9fa68b7f4b8fadb5ccc6da081aa6a40b5a9;hb=2b0894555df9673b13e43bce6448c8f261250b64;hp=1932859624856d598246123279cd41a40d74a7ef;hpb=078eca553c824ed2f789a0ab46ec21823feb2504;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 193285962..8369a9fa6 100644
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
 ##############################################################################
-# Copyright (c) 2015 The Linux Foundation and others.
+# Copyright (c) 2015, 2017 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -9,29 +9,27 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-# DATESTAMP=true  # Example
-# RELEASE_TAG=Helium-SR2  # Example
-# RELEASE_BRANCH=stable/helium  # Example
+# RELEASE_TAG=Beryllium-SR1  # Example
+# RELEASE_BRANCH=stable/beryllium  # Example
 
 # Directory to put git format-patches
-PATCH_DIR=`pwd`/patches
+PATCH_DIR="$WORKSPACE/patches"
 
-if [ "$DATESTAMP" == "true" ]; then
-   export RELEASE_TAG=$RELEASE_TAG-`date -u +v%Y%m%d%H%M`
-fi
-
-echo $RELEASE_TAG
-./scripts/version.sh release $RELEASE_TAG
+echo "$RELEASE_TAG"
+lftools version release "$RELEASE_TAG"
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
-mv taglist.log $PATCH_DIR
-modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
+# TODO: Fix this workaround so that scripts will ensure that taglist.log exists and archived.
+mv taglist.log "$PATCH_DIR" || true
+modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
 for module in $modules; do
-    pushd $module
-    git format-patch --stdout origin/$RELEASE_BRANCH > $PATCH_DIR/${module//\//-}.patch
+    pushd "$module"
+    git format-patch --stdout "origin/$RELEASE_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
+    git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd
 done
 
-./scripts/fix-relativepaths.sh
+tar cvzf patches.tar.gz -C "$WORKSPACE" patches
+rm "$PATCH_DIR"/*.bundle