commit 9742ff225666737a2f31d67a6cadf9dadfb6a383
author George Keishing <gkeishin@in.ibm.com> Fri Jul 09 13:00:20 2021 -0500
committer George Keishing <gkeishin@in.ibm.com> Sat Jul 10 10:52:20 2021 +0000
tree 953c1e8f044071ab747659c681f89e6a8d2fa607
parent 5b43c227a13fc3442f166eabdafe0889ca617f17

Update YAML for distro sos report

Changes:
     - Update timeout for sos report
     - Remove DUMP_LOGS block from YAML

Change-Id: I9d7a08a3636dc7244b38a8e8a68066ebdf71ebc0
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

ffdc/ffdc_config.yaml

diff --git a/ffdc/ffdc_config.yaml b/ffdc/ffdc_config.yaml
index 3e8a5f0..ea26aca 100644
--- a/ffdc/ffdc_config.yaml
+++ b/ffdc/ffdc_config.yaml
@@ -173,7 +173,7 @@
             - 'tail -n 200000 /var/log/syslog >/tmp/OS_syslog.txt 2>&1'
             - '{ uname -a; dpkg -s opal-prd; dpkg -s ipmitool ; } >/tmp/OS_info.txt 2>&1'
             - 'rm -rf /tmp/sosreport*FFDC*'
-            - 'sosreport --batch --tmp-dir /tmp --ticket-number FFDC >/tmp/OS_sosreport.txt 2>&1'
+            - {'sosreport --batch --tmp-dir /tmp --ticket-number FFDC >/tmp/OS_sosreport.txt 2>&1': 1200}
         FILES:
             - '/tmp/OS_isub.txt'
             - '/tmp/OS_kern.txt'
@@ -181,14 +181,6 @@
             - '/tmp/OS_syslog.txt'
             - '/tmp/OS_info.txt'
             - '/tmp/OS_sosreport.txt'
-        PROTOCOL:
-            - 'SSH'
-
-    # Commands and Files to collect dumps
-    DUMP_LOGS:
-        COMMANDS:
-            - 'ls -AX /tmp/sosreport*.tar.xz'
-        FILES:
             - '/tmp/sosreport*.tar.xz'
         PROTOCOL:
             - 'SSH'
@@ -200,19 +192,11 @@
             - '{ cat /etc/os-release; uname -a; rpm -qa ; } >/tmp/OS_info.txt 2>&1'
             - 'tail -n 200000 /var/log/messages >/tmp/OS_syslog.txt 2>&1'
             - 'rm -rf /tmp/sosreport*FFDC*'
-            - 'sosreport --batch --tmp-dir /tmp --label FFDC >/tmp/OS_sosreport.txt 2>&1'
+            - {'sosreport --batch --tmp-dir /tmp --label FFDC >/tmp/OS_sosreport.txt 2>&1': 1200}
         FILES:
             - '/tmp/OS_info.txt'
             - '/tmp/OS_syslog.txt'
             - '/tmp/OS_sosreport.txt'
-        PROTOCOL:
-            - 'SSH'
-
-    # Commands and Files to collect dumps
-    DUMP_LOGS:
-        COMMANDS:
-            - 'ls -AX /tmp/sosreport*.tar.xz'
-        FILES:
             - '/tmp/sosreport*.tar.xz'
         PROTOCOL:
             - 'SSH'
@@ -224,20 +208,12 @@
             - '{ cat /etc/os-release; uname -a; rpm -qa ; } >/tmp/OS_info.txt 2>&1'
             - 'tail -n 200000 /var/log/messages >/tmp/OS_syslog.txt 2>&1'
             - 'rm -rf /tmp/scc*.txz.md5'
-            - 'supportconfig >/tmp/OS_supportconfig.txt 2>&1'
+            - {'supportconfig >/tmp/OS_supportconfig.txt 2>&1': 1200}
             - 'cp /var/log/scc*.txz.md5 /tmp/'
         FILES:
             - '/tmp/OS_info.txt'
             - '/tmp/OS_syslog.txt'
             - '/tmp/OS_supportconfig.txt'
-        PROTOCOL:
-            - 'SSH'
-
-    # Commands and Files to collect dumps
-    DUMP_LOGS:
-        COMMANDS:
-            - 'ls -AX /tmp/scc*.txz.md5'
-        FILES:
             - '/tmp/scc*.txz.md5'
         PROTOCOL:
             - 'SSH'