From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 9 May 2017 10:45:33 +0000 (+0000)
Subject: Merge "Archive all sar data on logs server"
X-Git-Tag: release/carbon~59
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=90f94070ca328941c4267682ac9f00b613470299;hp=4dfd0109ed6b2fa92077e7e89748e1ca97432851;p=releng%2Fbuilder.git

Merge "Archive all sar data on logs server"
---

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f88c21a50..5275b52aa 100644
--- 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