diff options
| author | PMR <pmr@pmr-lander> | 2017-07-11 14:51:06 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2017-07-11 14:51:06 +0000 |
| commit | e8eb04725191e3ca4beaefc87a02c57022632a68 (patch) | |
| tree | 3f9eb88ec57acefbbfd1142524b47ffd7303c343 | |
| parent | f04036b62acfd18818e5eb1540e58b8bba7817c0 (diff) | |
| parent | d24deff8a86e0725ff64760dbea40c9a24cbfa15 (diff) | |
Merge #327135 from ~bladernr/plainbox-provider-checkbox:no-usb-s390
| -rw-r--r-- | jobs/usb.txt.in | 4 |
1 files changed, 4 insertions, 0 deletions
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) |