Simplify patches tarball creation

We should be pulling in everything in the PATCHES directory (especially
taglist.log) and it does not hurt to also pull in the diff files as a
backup for the bundle files.

Also fixes issue where the tarball contains the path w/jenkins-host/...
we just need it to include a patches directory.

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 6eddc0dbf3fb22becec736ed014d721bf6b572e1..b432b34ddb487a58a1b835f457dc97d5e9eb3675 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -23,7 +23,12 @@
           integration-test: beryllium
 
     project: 'releng/autorelease'
-    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch all-bundles.tar.gz'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/patches/*.bundle
+        **/patches/*.patch
+        patches.tar.gz
 
 ###
 # TODO: Remove this job once guava21 testing is complete

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 8e209fee60b0a5c5540264075fff294b0647e13e..0b38f0ee081549f07041083a0cdd8644b1b80c1d 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -26,7 +26,7 @@ fi
 source "$LFTOOLS_DIR/bin/activate"
 
 # Directory to put git format-patches
-PATCH_DIR="$(pwd)/patches"
+PATCH_DIR="$WORKSPACE/patches"
 
 echo "$RELEASE_TAG"
 lftools version release "$RELEASE_TAG"
@@ -43,8 +43,5 @@ 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)"
+tar cvzf patches.tar.gz -C "$WORKSPACE" patches
 rm "$PATCH_DIR"/*.bundle