Merge branch 'master' into release

4 files changed, 49 insertions, 1 deletions

diff --git a/bin/bt_connect b/bin/bt_connect
index b52642a..1fed30e 100755
--- a/bin/bt_connect
+++ b/bin/bt_connect
@@ -23,7 +23,7 @@
 import sys
 import time
 
-import checkbox_support.bt_helper
+import checkbox_support.bt_helper as bt_helper
 
 from argparse import ArgumentParser
 
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index dc79a32..6dec07d 100644
--- a/jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -334,3 +334,23 @@ _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
+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
+
+plugin: attachment
+category_id: com.canonical.plainbox::miscellanea
+estimated_duration: 5.0
+id: miscellanea/sosreport_attachment
+depends: miscellanea/sosreport
+user: root
+command:
+ SOSFILE=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1`; [ -e ${SOSFILE} ] && base64 $SOSFILE
+_summary: Attach the baseline sosreport file
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 64c05f1..a267a21 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -2223,6 +2223,9 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2270,6 +2273,9 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2319,6 +2325,9 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sdhc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2367,6 +2376,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/cf-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2414,6 +2426,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2461,6 +2476,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/ms-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2508,6 +2526,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/msp-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2555,6 +2576,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/xd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
diff --git a/jobs/usb.txt.in b/jobs/usb.txt.in
index acca8f5..8fa63d7 100644
--- a/jobs/usb.txt.in
+++ b/jobs/usb.txt.in
@@ -6,6 +6,8 @@ value-type: bool
 plugin: shell
 category_id: com.canonical.plainbox::usb
 id: usb/detect
+requires:
+ cpuinfo.platform != 's390x'
 estimated_duration: 1.0
 command:
 set -o pipefail
@@ -227,6 +229,7 @@ estimated_duration: 45.0
 command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
 flags: also-after-suspend preserve-cwd
 requires:
+ cpuinfo.platform != 's390x'
 package.name == 'udisks2' or snap.name == 'udisks2'
 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
 _summary:
@@ -242,6 +245,7 @@ id: usb3/storage-preinserted
 user: root
 flags: also-after-suspend
 requires:
+ cpuinfo.platform != 's390x'
 usb.usb3 == 'supported'
 package.name == 'udisks2' or snap.name == 'udisks2'
 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)