diff options
| author | Jeff Lane <jeffrey.lane@canonical.com> | 2017-08-15 16:39:43 -0400 |
|---|---|---|
| committer | Jeff Lane <jeffrey.lane@canonical.com> | 2017-08-15 16:39:43 -0400 |
| commit | 62f4816a899e45e1eeb37939bb0ffe4b8c4e0da0 (patch) | |
| tree | 74f61e9533334219d27653138ce0efd9ff4aae8d | |
| parent | 1cbb3c3c1c9e46d2d0468e951acc8edcd15ce9aa (diff) | |
Modified dmi related jobs for Server to use the new dmi_present.state resource rather than a list of architectures lp: #1706213
| -rw-r--r-- | jobs/miscellanea.txt.in | 10 | ||||
| -rw-r--r-- | jobs/submission.txt.in | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index 6dec07d..654ce26 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -179,7 +179,7 @@ category_id: com.canonical.plainbox::miscellanea id: miscellanea/cpus_are_not_samples requires: package.name == 'dmidecode' or executable.name == 'dmidecode' - cpuinfo.platform in ("i386", "x86_64") + dmi_present.state == 'supported' estimated_duration: 0.5 user: root command: dmitest cpu-check @@ -193,7 +193,7 @@ category_id: com.canonical.plainbox::miscellanea id: miscellanea/dmitest_server requires: package.name == 'dmidecode' or executable.name == 'dmidecode' - cpuinfo.platform in ("i386", "x86_64") + dmi_present.state == 'supported' estimated_duration: 0.5 user: root command: dmitest --test_versions server @@ -205,7 +205,9 @@ _summary: plugin: shell category_id: com.canonical.plainbox::miscellanea id: miscellanea/dmitest_client -requires: package.name == 'dmidecode' +requires: + package.name == 'dmidecode' + dmi_present.state == 'supported' estimated_duration: 0.5 user: root command: dmitest --test_versions --test_serials desktop @@ -318,6 +320,8 @@ estimated_duration: 30.0 id: miscellanea/get_make_and_model user: root command: get_make_and_model +requires: + dmi_present.state == 'supported' _description: Retrieve the computer's make and model for easier access than digging through the dmidecode output. _summary: Gather info on the SUT's make and model diff --git a/jobs/submission.txt.in b/jobs/submission.txt.in index 5ee8ba1..2005f04 100644 --- a/jobs/submission.txt.in +++ b/jobs/submission.txt.in @@ -28,7 +28,7 @@ plugin: attachment category_id: com.canonical.plainbox::info requires: package.name == 'dmidecode' or executable.name == 'dmidecode' - cpuinfo.platform in ("i386", "x86_64") + dmi_present.state == 'supported' user: root command: dmidecode -t bios -t system | plainbox dev parse dmidecode | \ |