Merge lp:~bladernr/checkbox/no-ipmi-s390x into lp:checkbox

[Jeff Lane]

Filter so ipmi tests dont run on z Systems

[Sylvain Pineau (sylvain-pineau)]

+1, thanks

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/jobs/miscellanea.txt.in'
--- providers/plainbox-provider-checkbox/jobs/miscellanea.txt.in	2016-03-21 16:13:00 +0000
+++ providers/plainbox-provider-checkbox/jobs/miscellanea.txt.in	2016-04-14 21:48:42 +0000
@@ -88,7 +88,9 @@
 plugin: shell
 category_id: 2013.com.canonical.plainbox::miscellanea
 id: miscellanea/ipmi_test
-requires: package.name == 'ipmitool'
+requires: 
+ package.name == 'ipmitool'
+ cpuinfo.platform != 's390x'
 user: root
 command: ipmi_test
 _summary:
@@ -112,7 +114,9 @@
 plugin: shell
 category_id: 2013.com.canonical.plainbox::miscellanea
 id: miscellanea/bmc_info
-requires: package.name == 'ipmitool'
+requires: 
+ package.name == 'ipmitool'
+ cpuinfo.platform != 's390x'
 estimated_duration: 0.5
 user: root
 command: bmc_info