diff options
| author | Jeff Lane <jeffrey.lane@canonical.com> | 2016-04-15 08:01:39 +0000 |
|---|---|---|
| committer | Sylvain Pineau <> | 2016-04-15 08:01:39 +0000 |
| commit | 408d7fddd363ce07d0de01bd52e78078ed1e2623 (patch) | |
| tree | 77a2ac9a9779e1388bd6ba8f0bc98fe3a69bf9e9 /jobs | |
| parent | ea4257fc2de211064f2970c845f3abeb9fc6a6ee (diff) | |
| parent | 3cf891a24d1ccb4126e7c9f461c4266d6726d641 (diff) | |
"automatic merge of lp:~bladernr/checkbox/no-ipmi-s390x/ by tarmac [r=sylvain-pineau][bug=1570610][author=bladernr]"
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/miscellanea.txt.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index 59ac24a..696157c 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -88,7 +88,9 @@ _summary: Attach FWTS log to submission (to HWE) 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 @@ command: boot_mode_test 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 |