From d00b5254d235767c72bfbeb4ec4ab056cc4e9339 Mon Sep 17 00:00:00 2001 From: Jeff Lane Date: Mon, 10 Jul 2017 13:54:12 -0400 Subject: Add new sosreport job and attachment job LP:1703420 --- jobs/miscellanea.txt.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index fe26ae1..dd025f6 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -334,3 +334,20 @@ _steps: 2. Compare items on System Manifest to the devices known to udev _verification: Do the devices reported by udev match the devices on the Manifest? + +plugin: shell +category_id: com.canonical.plainbox::miscellanea +estimated_duration: 20.0 +id: miscellanea/sosreport +user: root +command: sosreport --batch --tmp-dir $PLAINBOX_SESSION_SHARE +_summary: Generate baseline sosreport +_description: Generates a baseline sosreport of logs and system data + +plugin: attachment +category_id: com.canonical.plainbox::miscellanea +estimated_duration: 5.0 +id: miscellanea/sosreport_attach +command: + filename=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1` \ + [ -e $filename ] && base64 $filename -- cgit v1.2.3 From d820e100a091e236f0fd5b2ef839d88f7648130f Mon Sep 17 00:00:00 2001 From: Jeff Lane Date: Mon, 10 Jul 2017 18:46:39 -0400 Subject: Add sosreport job and fixed issues with attachment job LP: #1703420 --- jobs/miscellanea.txt.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index dd025f6..b925a6d 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -325,7 +325,7 @@ plugin: user-interact-verify category_id: com.canonical.plainbox::miscellanea estimated_duration: 5.0 id: miscellanea/device_check -command: udev_resource -l VIDEO NETWORK WIRELESS DISK | tee >([[ $DISPLAY ]] && zenity --text-info --title="Device report") +command: udev_resource -l VIDEO NETWORK WIRELESS DISK ACCELEROMETER | tee >([[ $DISPLAY ]] && zenity --text-info --title="Device report") _summary: Device Check _purpose: Device check @@ -347,7 +347,9 @@ _description: Generates a baseline sosreport of logs and system data plugin: attachment category_id: com.canonical.plainbox::miscellanea estimated_duration: 5.0 -id: miscellanea/sosreport_attach +id: miscellanea/sosreport_attachment +depends: miscellanea/sosreport +user: root command: - filename=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1` \ - [ -e $filename ] && base64 $filename + SOSFILE=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1`; [ -e ${SOSFILE} ] && base64 $SOSFILE +_summary: Attach the baseline sosreport file -- cgit v1.2.3 From bc6c00071e60689a9278966200c5e6c785b26130 Mon Sep 17 00:00:00 2001 From: Jeff Lane Date: Tue, 11 Jul 2017 10:12:07 -0400 Subject: Added package requriement for sosreport job --- jobs/miscellanea.txt.in | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index b925a6d..adf3199 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -340,6 +340,7 @@ category_id: com.canonical.plainbox::miscellanea estimated_duration: 20.0 id: miscellanea/sosreport user: root +requires: package.name == 'sosreport' command: sosreport --batch --tmp-dir $PLAINBOX_SESSION_SHARE _summary: Generate baseline sosreport _description: Generates a baseline sosreport of logs and system data -- cgit v1.2.3 From c727cf315f546ca939aed0c100c38f812ac8d720 Mon Sep 17 00:00:00 2001 From: Jeff Lane Date: Tue, 11 Jul 2017 11:25:25 -0400 Subject: More fixes per review to fit new schema --- jobs/miscellanea.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index adf3199..6dec07d 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -340,7 +340,7 @@ category_id: com.canonical.plainbox::miscellanea estimated_duration: 20.0 id: miscellanea/sosreport user: root -requires: package.name == 'sosreport' +requires: executable.name == 'sosreport' command: sosreport --batch --tmp-dir $PLAINBOX_SESSION_SHARE _summary: Generate baseline sosreport _description: Generates a baseline sosreport of logs and system data -- cgit v1.2.3