From c887df2200ea8a7a58e0aeb538affd0c93a48dfc Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 8 Jun 2017 07:48:59 +1000 Subject: [PATCH 1/1] Enable sar report collection for global-jjb Change-Id: I0615d295b17151ade5c899350069516d66e6d809 Jira: releng-46 Signed-off-by: Anil Belur --- jjb/lf-macros.yaml | 7 +++++++ shell/sysstat.sh | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 shell/sysstat.sh diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 310df5d7..bc64719c 100644 --- 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 index 00000000..e4e28ff6 --- /dev/null +++ b/shell/sysstat.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# @License 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 -- 2.16.6