From 98747cf3e1d24b1e097bcfc2443790332b4f8795 Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Tue, 25 Apr 2017 07:59:37 +1000
Subject: [PATCH] Move sar stats to publishers

- Move sar report generation to publisher
- remove builder autorelease-sys-stats since we are capturing system
  info in deploy archives scripts.

Change-Id: Ibccb0d6712f709ed5f75395a15c96a56047cb720
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 jjb/autorelease/autorelease-macros.yaml    | 22 ++++++++++++----------
 jjb/autorelease/autorelease-projects.yaml  |  1 -
 jjb/autorelease/autorelease-templates.yaml |  4 ++--
 jjb/include-raw-deploy-archives.sh         |  1 +
 jjb/releng-templates-java.yaml             |  1 -
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index ffde68726..303d6e1d9 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -115,16 +115,6 @@
     builders:
       - shell: !include-raw: include-raw-autorelease-release-versions.sh
 
-- builder:
-    name: autorelease-sys-stats
-    builders:
-      - shell: |
-          uname -a
-          df -h
-          # generate accounting summary
-          sudo LC_ALL=C /usr/lib64/sa/sa2 -A
-          sar -r
-
 - builder:
     name: autorelease-get-integration-test-variables
     builders:
@@ -149,3 +139,15 @@
             - shell: !include-raw: include-raw-autorelease-notify-build-failure.sh
           script-only-if-succeeded: 'False'
           script-only-if-failed: 'True'
+
+- publisher:
+    # generate sar accounting summary and copy sar data to archive
+    name: opendaylight-infra-sysstats
+    publishers:
+      - postbuildscript:
+          builders:
+            - shell: |
+                # generate accounting summary
+                sudo LC_ALL=C /usr/lib64/sa/sa2 -A
+                mkdir -p archives/
+                cp /var/log/sa/* $_
diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 2ca72409b..a53c45945 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -215,7 +215,6 @@
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
       - autorelease-maven-sources-post-process
-      - autorelease-sys-stats
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index bba7d4f0b..856229885 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -103,13 +103,13 @@
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
       - autorelease-maven-sources-post-process
-      - autorelease-sys-stats
       - shell: |
           mkdir -p archives/
-          cp /var/log/sa/* *.log *.prop $_
+          cp *.log *.prop $_
 
     publishers:
       - opendaylight-infra-notify-status
+      - opendaylight-infra-sysstats
       - archive:
           # Need to archive dependencies.log in Jenkins to provide a simple
           # way for downstream jobs to pull the latest version of this file
diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
index 134db1928..4f1e6eb15 100644
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -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
diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 59a729eab..80783eaa2 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -422,7 +422,6 @@
           settings-type: cfp
           global-settings: 'odl-global-settings'
           global-settings-type: cfp
-      - autorelease-sys-stats
 
     publishers:
       - email-notification:
-- 
2.36.6