Merge "Migrate autorelease jobs to lf-infra-publish"

[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 0342d07babba1982e5608d70be8ed83c34b76cae..4f1e6eb15a75679cf761cc5892b8b21bb39429d4 100644 (file)
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -78,7 +78,7 @@ if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
     for f in $ARCHIVE_ARTIFACTS; do
         [[ -e $f ]] || continue  # handle the case of no files to archive
         echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
-        dir=$(dirname "$f")
+        dir="$(dirname "$f")"
         mkdir -p "$WORKSPACE/archives/$dir"
         mv "$f" "$WORKSPACE/archives/$f"
     done
@@ -91,7 +91,7 @@ fi
 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"
-env | grep -v PASSWORD > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
+env | grep -v PASSWORD | sort > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
 
 # capture system info
 touch "$ARCHIVES_DIR/_sys-info.txt"
@@ -102,6 +102,7 @@ touch "$ARCHIVES_DIR/_sys-info.txt"
     echo -e "nproc:\n $(nproc) \n"
     echo -e "lscpu:\n $(lscpu) \n"
     echo -e "ip addr:\n  $(/sbin/ip addr) \n"
+    echo -e "sar -r:\n  $(sar -r) \n"
 } 2>&1 | tee -a "$ARCHIVES_DIR/_sys-info.txt"
 
 # Magic string used to trim console logs at the appropriate level during wget