diff options
| author | Jeff Lane <jeffrey.lane@canonical.com> | 2018-10-01 17:11:52 -0400 |
|---|---|---|
| committer | Jeff Lane <jeffrey.lane@canonical.com> | 2018-10-01 17:11:52 -0400 |
| commit | e89c21bd5e96c8ae44d4b5530aa339ad04e514b5 (patch) | |
| tree | fbe31eb8b8b96d1134ae9ae2ef11b38645e4fb45 | |
| parent | 3793b4fd9fd8483be161a6223561430df2a73072 (diff) | |
Added a second lstopo job to create a small png system map. Modified original job.
| -rw-r--r-- | units/info/jobs.pxu | 18 | ||||
| -rw-r--r-- | units/info/packaging.pxu | 4 | ||||
| -rw-r--r-- | units/info/test-plan.pxu | 3 |
3 files changed, 19 insertions, 6 deletions
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu index 78a60fe..2f45f55 100644 --- a/units/info/jobs.pxu +++ b/units/info/jobs.pxu @@ -430,11 +430,23 @@ estimated_duration: 0.2 _summary: System boot-up performance statistics command: systemd-analyze -id: lstopo_attachment +id: lstopo_verbose_attachment plugin: attachment category_id: com.canonical.plainbox::info -command: lstopo -v +command: lstopo -v estimated_duration: 0.015 -requires: package.name == 'hwloc-nox' or executable.name == 'lstopo' +requires: package.name == 'hwloc' or executable.name == 'lstopo' _description: Attaches the system topology as presented by the lstopo command _summary: Attach the output of lstopo + +id: lstopo_visual_attachment +plugin: attachment +category_id: com.canonical.plainbox::info +estimated_duration: 0.015 +requires: package.name == 'hwloc' or executable.name == 'lstopo' +_description: Attaches the system topology as presented by the lstopo command +_summary: Attach the output of lstopo +command: lstopo $lstopo_visual.png + lstopo $PLAINBOX_SESSION_SHARE/lstopo_visual.png; \ + [ -e "$PLAINBOX_SESSION_SHARE/lstopo_visual.png" ] && \ + cat "$PLAINBOX_SESSION_SHARE/lstopo_visual.png" diff --git a/units/info/packaging.pxu b/units/info/packaging.pxu index bc709fb..dba4c80 100644 --- a/units/info/packaging.pxu +++ b/units/info/packaging.pxu @@ -13,7 +13,7 @@ unit: packaging meta-data os-id: debian Depends: util-linux -# This is to install hwloc-nox for the lstopo attachment +# This is to install hwloc for the lstopo attachment jobs unit: packaing meta-data os-id: debian -Depends: hwloc-nox +Depends: hwloc diff --git a/units/info/test-plan.pxu b/units/info/test-plan.pxu index 2930405..c7905b7 100644 --- a/units/info/test-plan.pxu +++ b/units/info/test-plan.pxu @@ -42,7 +42,8 @@ include: lsmod_attachment lspci_attachment lspci_standard_config_attachment - lstopo_attachment + lstopo_verbose_attachment + lstopo_visual_attachment lsusb_attachment meminfo_attachment modinfo_attachment |