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>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index ffde68726a0d7fde0ce824e1ea70cfa4741aa738..303d6e1d905853b2d46127812ac1e7e2bebfb588 100644 (file)
--- 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 2ca72409b00f7a05cd8e9bde4e56fee20696ee72..a53c459456c2f48c441a4d90511390c8978d454e 100644 (file)
--- 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 bba7d4f0b0361fd3dac1a66d2b16be6ecac0cd4e..8562298855a423375a561318a7027856d7c53765 100644 (file)
--- 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 134db192844c45222ce16871a9bdc863b980b8d8..4f1e6eb15a75679cf761cc5892b8b21bb39429d4 100644 (file)
--- 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 59a729eab8f3ea0d0b27184c4191237952f5f108..80783eaa287c1143d882bce5f7d8d5f1d263c2ef 100644 (file)
--- 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: