Merge "Add Archiving... log message to archives.log"

[releng/builder.git] / jjb / include-raw-deploy-archives.sh

diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
index b0351d1e6b9d230460a5cc94906e3127ada6fa7d..78594e1591fed3f09d1e4107243e2cdd60a68e34 100644 (file)
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -77,7 +77,7 @@ if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
     shopt -s globstar  # Enable globstar to copy archives
     for f in $ARCHIVE_ARTIFACTS; do
         [[ -e $f ]] || continue  # handle the case of no files to archive
-        echo "Archiving $f"
+        echo "Archiving $f" >> "$ARCHIVES_DIR/_archives.log"
         dir=$(dirname "$f")
         mkdir -p "$WORKSPACE/archives/$dir"
         mv "$f" "$WORKSPACE/archives/$f"
@@ -90,7 +90,7 @@ fi
 # Ignore logging if archives doesn't exist
 mv "$WORKSPACE/archives/" "$ARCHIVES_DIR" > /dev/null 2>&1
 touch "$ARCHIVES_DIR/_build-details.txt"
-echo "build-url: ${{BUILD_URL}}" >> "$ARCHIVES_DIR/_build-details.txt"
+echo "build-url: ${BUILD_URL}" >> "$ARCHIVES_DIR/_build-details.txt"
 env | grep -v PASSWORD > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
 
 # capture system info
@@ -118,6 +118,8 @@ find "$ARCHIVES_DIR" -type f -print0 \
                 | egrep -e ':.*text.*' \
                 | cut -d: -f1 \
                 | xargs -d'\n' -r gzip
+# Compress Java heap dumps using xz
+find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz
 
-zip -r archives.zip "$JENKINS_HOSTNAME/" > "$ARCHIVES_DIR/_archives-zip.log"
+zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log"
 du -sh archives.zip