Merge "Migrate tsdr matrix-verify jobs to freestyle-verify jobs"

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-release-versions.sh

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bbf90e22614231696a4b21a06d11de19955630ac..3673c01669da4cf36515f1812982cc749a31d3c0 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -9,13 +9,11 @@
 # 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
 
-if [ "$DATESTAMP" == "true" ]; then
-   export RELEASE_TAG=$RELEASE_TAG-`date -u +v%Y%m%d%H%M`
-fi
+# Directory to put git format-patches
+PATCH_DIR=`pwd`/patches
 
 echo $RELEASE_TAG
 ./scripts/version.sh release $RELEASE_TAG
@@ -23,11 +21,13 @@ 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`
 for module in $modules; do
-    cd $module
-    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
-    cd ..
+    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