Merge #355951 from ~bladernr/plainbox-provider-checkbox:add-lstopo-attachment

3 files changed, 63 insertions, 0 deletions

diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index dee4fd5..4485829 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -429,3 +429,24 @@ id: info/systemd-analyze
 estimated_duration: 0.2
 _summary: System boot-up performance statistics
 command: systemd-analyze
+
+id: lstopo_verbose_attachment
+plugin: attachment
+category_id: com.canonical.plainbox::info
+command: lstopo -v 
+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
+
+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 $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 26d76cb..67f18c2 100644
--- a/units/info/packaging.pxu
+++ b/units/info/packaging.pxu
@@ -12,3 +12,8 @@ Depends: python3-guacamole (>= 0.9)
 unit: packaging meta-data
 os-id: debian
 Depends: util-linux
+
+# This is to install hwloc for the lstopo attachment jobs
+unit: packaging meta-data
+os-id: debian
+Depends: hwloc
diff --git a/units/info/test-plan.pxu b/units/info/test-plan.pxu
index e54b443..d293954 100644
--- a/units/info/test-plan.pxu
+++ b/units/info/test-plan.pxu
@@ -42,6 +42,8 @@ include:
 lsmod_attachment
 lspci_attachment
 lspci_standard_config_attachment
+ lstopo_verbose_attachment
+ lstopo_visual_attachment
 lsusb_attachment
 meminfo_attachment
 modinfo_attachment
@@ -53,3 +55,38 @@ include:
 bootstrap_include:
 device
 
+id: server-info-attachment-automated
+unit: test plan
+_name: Info attachment jobs for Server Cert (Automated)
+_description:
+ Info attachment jobs for Server Cert(Automated)
+include:
+ config_file_attachment
+ cpuinfo_attachment
+ dkms_info_attachment
+ dmesg_attachment
+ dmi_attachment
+ dmidecode_attachment
+ efi_attachment
+ info/disk_partitions
+ info/hdparm_.*.txt
+ installer_debug.gz
+ kernel_cmdline_attachment
+ lsblk_attachment
+ lshw_attachment
+ lsmod_attachment
+ lspci_attachment
+ lstopo_verbose_attachment
+ lstopo_visual_attachment
+ lsusb_attachment
+ meminfo_attachment
+ modinfo_attachment
+ modprobe_attachment
+ modules_attachment
+ sysctl_attachment
+ sysfs_attachment
+ udev_attachment
+ udev-summary_attachment
+bootstrap_include:
+ device
+ fwts