summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2018-07-04 09:35:50 +0000
committerPMR <pmr@pmr-lander>2018-07-04 09:35:50 +0000
commite2f6f2e07c3d73e5a8c398f6359f008d3aad07bc (patch)
treead7fb03a073abb2bef48f7525da17131f5e511f9
parent3671705c73281db9ef35400d27d7c9a7e167a376 (diff)
parent0dd0572701b7245f12259127833b4bc0f9a63c07 (diff)
Merge #348932 from ~jocave/plainbox-provider-checkbox:fix-machine-typessnap-2018-07-04T1003
-rw-r--r--units/cpu/jobs.pxu2
-rw-r--r--units/miscellanea/jobs.pxu2
2 files changed, 2 insertions, 2 deletions
diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
index adf34b9..a64757e 100644
--- a/units/cpu/jobs.pxu
+++ b/units/cpu/jobs.pxu
@@ -77,7 +77,7 @@ _summary:
Test offlining of each CPU core
_description:
Attempts to offline each core in a multicore system.
-requires: cpuinfo.platform not in ("aarch64", "armhf")
+requires: cpuinfo.platform not in ("aarch64", "armv7l")
plugin: shell
category_id: com.canonical.plainbox::cpu
diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
index a1d4f5a..7ddcc1b 100644
--- a/units/miscellanea/jobs.pxu
+++ b/units/miscellanea/jobs.pxu
@@ -81,7 +81,7 @@ id: miscellanea/fwupdate
estimated_duration: 1.0
depends: miscellanea/efi_boot_mode
requires:
- cpuinfo.platform in ("i386", "x86_64", "aarch64", "armhf")
+ cpuinfo.platform in ("i386", "x86_64", "aarch64", "armv7l")
package.name == 'fwupdate' or executable.name == 'fwupdate'
_description:
Determine if EFI firmware supports update from OS.