Merge "Archive all sar data on logs server"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f88c21a5013e60f22059c985d10f3db2eadadf82..5275b52aa1eac321a1862cf40dd9fcdc2dd6e32a 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -161,6 +161,9 @@
                 mkdir -p archives/
                 cp /var/log/sa/* $_
                 # convert sar data to ascii format
-                sar -A -f /var/log/sa/sa$(date +%d) > archives/sar$(date +%d)
+                while IFS="" read -r s
+                do
+                    [ -f "$s" ] && sar -A -f "$s" > archives/sar/sar${s//[!0-9]/}
+                done < <(find /var/log/{sa,sysstat} -name "sa[0-9]*")
           script-only-if-succeeded: false
           script-only-if-failed: false