Merge ~bladernr/plainbox-provider-checkbox:no-usb-s390 into plainbox-provider-checkbox:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: d24deff8a86e0725ff64760dbea40c9a24cbfa15
Merged at revision: e8eb04725191e3ca4beaefc87a02c57022632a68
Proposed branch: ~bladernr/plainbox-provider-checkbox:no-usb-s390
Merge into: plainbox-provider-checkbox:master
Diff against target: 29 lines (+4/-0)
1 file modified
jobs/usb.txt.in (+4/-0)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+327135@code.launchpad.net

Description of the change

USB jobs shouldn't run on s390x systems

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
6plugin: shell6plugin: shell
7category_id: com.canonical.plainbox::usb7category_id: com.canonical.plainbox::usb
8id: usb/detect8id: usb/detect
9requires:
10 cpuinfo.platform != 's390x'
9estimated_duration: 1.011estimated_duration: 1.0
10command:12command:
11 set -o pipefail13 set -o pipefail
@@ -227,6 +229,7 @@ estimated_duration: 45.0
227command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb229command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
228flags: also-after-suspend preserve-cwd230flags: also-after-suspend preserve-cwd
229requires:231requires:
232 cpuinfo.platform != 's390x'
230 package.name == 'udisks2' or snap.name == 'udisks2'233 package.name == 'udisks2' or snap.name == 'udisks2'
231 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)234 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
232_summary:235_summary:
@@ -242,6 +245,7 @@ id: usb3/storage-preinserted
242user: root245user: root
243flags: also-after-suspend246flags: also-after-suspend
244requires:247requires:
248 cpuinfo.platform != 's390x'
245 usb.usb3 == 'supported'249 usb.usb3 == 'supported'
246 package.name == 'udisks2' or snap.name == 'udisks2'250 package.name == 'udisks2' or snap.name == 'udisks2'
247 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)251 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)

Subscribers

People subscribed via source and target branches