Merge "Gzip *.bundle files under archives/patches for autorelease"

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 3673c01669da4cf36515f1812982cc749a31d3c0..66d8808b183079958dc72666b202720302cdd65b 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -30,4 +30,10 @@ for module in $modules; do
     popd
 done
 
+tar cvzf all-bundles.tar.gz `find $PATCH_DIR -type f -print0 \
+                                | xargs -0r file             \
+                                | egrep -e ':.*Git bundle.*' \
+                                | cut -d: -f1`
+rm $PATCH_DIR/*.bundle
+
 ./scripts/fix-relativepaths.sh

diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
index c6e5316a1196bb3a6d2c0f498437ddf53d2805b9..936d3eabc34bf65b39b9493e946869b3db8af013 100644 (file)
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -68,6 +68,8 @@ if [ ! -z "${{ARCHIVE_ARTIFACTS}}" ]; then
     shopt -u globstar  # Disable globstar once archives are copied
     popd
 fi
+
+
 # Ignore logging if archives doesn't exist
 mv $WORKSPACE/archives/ $ARCHIVES_DIR > /dev/null 2>&1
 touch $ARCHIVES_DIR/_build-details.txt