Merge "Enable sar report collection for global-jjb"

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 310df5d..bc64719 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -40,6 +40,12 @@
       - description-setter:
           regexp: '^Build logs: .*'
 
+- builder:
+    name: lf-infra-sysstat
+    builders:
+      - shell: !include-raw:
+          - ../shell/sysstat.sh
+
 - builder:
     name: lf-jacoco-nojava-workaround
     builders:
@@ -160,6 +166,7 @@
     publishers:
       - postbuildscript:
           builders:
+            - lf-infra-sysstat
             - lf-infra-ship-logs
           script-only-if-succeeded: false
           script-only-if-failed: false

diff --git a/shell/sysstat.sh b/shell/sysstat.sh
new file mode 100644 (file)
index 0000000..e4e28ff
--- /dev/null
+++ b/shell/sysstat.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+echo "---> lftools-sysstat.sh"
+set +e  # DON'T fail build if script fails.
+
+OS=$(facter operatingsystem)
+case "$OS" in
+    Ubuntu)
+        SYSSTAT_PATH="/var/log/sysstat"
+    ;;
+    CentOS|RedHat)
+        SYSSTAT_PATH="/var/log/sa"
+    ;;
+    *)
+        # nothing to do
+        exit 0
+    ;;
+esac
+
+SAR_DIR="$WORKSPACE/archives/sar-reports"
+mkdir -p "$SAR_DIR"
+cp "$SYSSTAT_PATH/"* $_
+# convert sar data to ascii format
+while IFS="" read -r s
+do
+    [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/"sar${s//[!0-9]/}
+done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
+
+# DON'T fail build if script fails.
+exit 0