Import plainbox-provider-checkbox_0.55.0~rc1.orig.tar.gzupstream-0.55.0_rc1patched-0.55.0_rc1-1

1 files changed, 42 insertions, 33 deletions

diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index e1d56ae..a9031ad 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -19,9 +19,9 @@ category_id: com.canonical.plainbox::info
 user: root
 command:
 if [ -e /var/log/dmesg ]; then
- cat /var/log/dmesg | ansi_parser
+ ansi_parser.py < /var/log/dmesg
 else
- dmesg | ansi_parser
+ dmesg | ansi_parser.py
 fi
 estimated_duration: 0.640
 _description: Attaches a copy of /var/log/dmesg or the current dmesg buffer to the test results
@@ -30,7 +30,9 @@ _summary: Attach a copy of dmesg
 id: dmi_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: [ -d /sys/class/dmi/id/ ] && (grep -r . /sys/class/dmi/id/ 2>/dev/null || true) || false
+command:
+ # shellcheck disable=SC2015
+ [ -d /sys/class/dmi/id/ ] && (grep -r . /sys/class/dmi/id/ 2>/dev/null || true) || false
 estimated_duration: 0.044
 _description: Attaches info on DMI
 _summary: Attach a copy of /sys/class/dmi/id/*
@@ -41,7 +43,7 @@ id: dmidecode_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
 requires:
- package.name == 'dmidecode' or executable.name == 'dmidecode'
+ executable.name == 'dmidecode'
 dmi_present.state == 'supported'
 user: root
 command: dmidecode | iconv -t 'utf-8' -c
@@ -52,7 +54,7 @@ _summary: Attach output of dmidecode
 id: lshw_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-requires: package.name == 'lshw' or executable.name == 'lshw'
+requires: executable.name == 'lshw'
 user: root
 command: lshw | iconv -t 'utf-8' -c
 _summary: Attach lshw output
@@ -62,7 +64,9 @@ id: efi_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
 user: root
-command: [ -d /sys/firmware/efi ] && grep -m 1 -o --color=never 'EFI v.*' /var/log/kern.log* || true
+command:
+ # shellcheck disable=SC2015
+ [ -d /sys/firmware/efi ] && grep -m 1 -o --color=never 'EFI v.*' /var/log/kern.log* || true
 estimated_duration: 0.5
 _summary: Attaches firmware version info
 _description: Attaches the firmware version
@@ -72,7 +76,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 command:
 if [[ -v SNAP ]]; then
- lspci -i $SNAP/usr/share/misc/pci.ids -vvnn
+ lspci -i "$SNAP"/usr/share/misc/pci.ids -vvnn
 else
 lspci -vvnn | iconv -t 'utf-8' -c
 fi
@@ -103,7 +107,7 @@ category_id: com.canonical.plainbox::info
 user: root
 command:
 if [[ -v SNAP ]]; then
- checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids
+ checkbox-support-lsusb -f "$CHECKBOX_RUNTIME"/var/lib/usbutils/usb.ids
 else
 lsusb -vv | iconv -t 'utf-8' -c
 fi
@@ -123,7 +127,7 @@ _description: Attaches info on system memory as seen in /proc/meminfo.
 id: modprobe_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: find /etc/modprobe.* -name \*.conf | xargs cat
+command: find /etc/modprobe.* -name \*.conf -exec cat {} +
 estimated_duration: 0.015
 _description: Attaches the contents of the various modprobe conf files.
 _summary: Attach the contents of /etc/modprobe.*
@@ -136,7 +140,7 @@ command:
 for mod in $(lsmod | cut -f 1 -d " ")
 do
 printf "%-16s%s\n" "name:" "$mod"
- modinfo $mod
+ modinfo "$mod"
 echo
 done
 estimated_duration: 1.5
@@ -153,7 +157,7 @@ _summary: Attach the contents of /etc/modules
 id: sysctl_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: find /etc/sysctl.* -name \*.conf | xargs cat
+command: find /etc/sysctl.* -name \*.conf -exec cat {} +
 estimated_duration: 0.014
 _description: Attaches the contents of various sysctl config files.
 _summary: Attach sysctl configuration files.
@@ -163,9 +167,9 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 _description: Attaches a report of sysfs attributes.
 command:
- for i in `udevadm info --export-db | sed -n 's/^P: //p'`; do
+ for i in $(udevadm info --export-db | sed -n 's/^P: //p'); do
 echo "P: $i"
- udevadm info --attribute-walk --path=/sys$i 2>/dev/null | sed -n 's/ ATTR{\(.*\)}=="\(.*\)"/A: \1=\2/p'
+ udevadm info --attribute-walk --path=/sys"$i" 2>/dev/null | sed -n 's/ ATTR{\(.*\)}=="\(.*\)"/A: \1=\2/p'
 echo
 done
 estimated_duration: 6.344
@@ -184,16 +188,16 @@ _summary: Attach dump of udev database
 id: udev_resource_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: udev_resource
+command: udev_resource.py
 estimated_duration: 0.432
-_description: Attaches the output of udev_resource, for debugging purposes
+_description: Attaches the output of udev_resource.py, for debugging purposes
 
 id: lsblk_attachment
 estimated_duration: 0.1
 plugin: attachment
 command: lsblk -i -n -P -o KNAME,TYPE,MOUNTPOINT
 requires:
- package.name == "util-linux" or executable.name == 'lsblk'
+ executable.name == 'lsblk'
 _description: Attaches disk block devices mount points
 _summary: Attach info block devices and their mount points
 
@@ -202,13 +206,13 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 requires: package.name == 'lcov'
 user: root
-command: gcov_tarball
+command: gcov_tarball.sh
 _description: Attaches a tarball of gcov data if present.
 
 id: lsmod_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: lsmod_info
+command: lsmod_info.py
 estimated_duration: 0.5
 _description: Attaches a list of the currently running kernel modules.
 _summary: Attach a list of currently running kernel modules
@@ -236,8 +240,9 @@ _description: Bootchart information.
 requires: package.name == 'bootchart' or package.name == 'pybootchartgui'
 user: root
 command:
- process_wait -u root bootchart collector ureadahead; \
- [ `ls /var/log/bootchart/*.tgz 2>/dev/null | wc -l` -lt 2 ] && reboot && sleep 100
+ process_wait.py -u root bootchart collector ureadahead; \
+ # shellcheck disable=SC2012
+ [ "$(ls /var/log/bootchart/*.tgz 2>/dev/null | wc -l)" -lt 2 ] && reboot && sleep 100
 
 unit: template
 template-resource: device
@@ -247,7 +252,7 @@ category_id: com.canonical.plainbox::info
 id: info/hdparm_{name}.txt
 estimated_duration: 1.0
 requires:
- package.name == 'hdparm' or executable.name == 'hdparm'
+ executable.name == 'hdparm'
 block_device.state != 'removable' and block_device.name == '{name}'
 user: root
 command: hdparm -I /dev/{name}
@@ -260,7 +265,8 @@ depends: info/bootchart
 requires: package.name == 'pybootchartgui'
 _description: Attaches the bootchart png file for bootchart runs
 command:
- file=`ls /var/log/bootchart/*.png 2>/dev/null | tail -1`; \
+ # shellcheck disable=SC2012
+ file=$(ls /var/log/bootchart/*.png 2>/dev/null | tail -1); \
 [ -e "$file" ] && cat "$file"
 
 plugin: attachment
@@ -269,7 +275,8 @@ id: bootchart.tgz
 depends: info/bootchart
 _description: Attaches the bootchart log for bootchart test runs.
 command:
- file=`ls /var/log/bootchart/*.tgz 2>/dev/null | tail -1`; \
+ # shellcheck disable=SC2012
+ file=$(ls /var/log/bootchart/*.tgz 2>/dev/null | tail -1); \
 [ -e "$file" ] && cat "$file"
 
 plugin: attachment
@@ -290,7 +297,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 id: info/touchpad_driver
 requires: device.category == 'TOUCHPAD'
-command: touchpad_driver_info
+command: touchpad_driver_info.py
 estimated_duration: 0.384
 _description:
 Returns the name, driver name and driver version of any touchpad discovered on
@@ -303,7 +310,7 @@ requires:
 package.name == 'pulseaudio-utils'
 package.name == 'kmod' or package.name == 'module-init-tools'
 device.category == 'AUDIO'
-command: audio_driver_info
+command: audio_driver_info.py
 estimated_duration: 0.177
 _description: Lists the device driver and version for all audio devices.
 
@@ -317,7 +324,7 @@ _description: Provides information about network devices
 plugin: attachment
 category_id: com.canonical.plainbox::info
 id: info/mobile_broadband_info
-command: broadband_info
+command: broadband_info.sh
 estimated_duration: 0.5
 _description: Provides information about wwan/mobile broadband devices
 
@@ -347,6 +354,8 @@ command:
 cat /etc/buildstamp
 elif [ -s /etc/media-info ]; then
 cat /etc/media-info
+ elif [ -s /writable/system-data/etc/buildstamp ]; then
+ cat /writable/system-data/etc/buildstamp
 elif [ -e /var/lib/snapd/seed/seed.yaml ]; then
 echo && date -r /var/lib/snapd/seed/seed.yaml -R
 else
@@ -415,7 +424,7 @@ _summary:
 _description:
 Attaches the debug log from the virtualization/kvm_check_vm test
 to the results submission.
-command: [ -f $PLAINBOX_SESSION_SHARE/virt_debug ] && cat $PLAINBOX_SESSION_SHARE/virt_debug
+command: [ -f "$PLAINBOX_SESSION_SHARE"/virt_debug ] && cat "$PLAINBOX_SESSION_SHARE"/virt_debug
 
 id: kernel_cmdline_attachment
 plugin: attachment
@@ -437,7 +446,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 command: lstopo -v 
 estimated_duration: 0.015
-requires: package.name == 'hwloc' or executable.name == 'lstopo'
+requires: executable.name == 'lstopo'
 _description: Attaches the system topology as presented by the lstopo command
 _summary: Attach the output of lstopo
 
@@ -445,11 +454,11 @@ id: lstopo_visual_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
 estimated_duration: 0.015
-requires: package.name == 'hwloc' or executable.name == 'lstopo'
+requires: 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; \
+ lstopo "$PLAINBOX_SESSION_SHARE"/lstopo_visual.png; \
 [ -e "$PLAINBOX_SESSION_SHARE/lstopo_visual.png" ] && \
 cat "$PLAINBOX_SESSION_SHARE/lstopo_visual.png"
 
@@ -458,16 +467,16 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 estimated_duration: 0.2
 _summary: attach network configuration
-command: network_configs
+command: network_configs.sh
 
 id: parts_meta_info_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
 command:
 # some top-level snaps don't bother with parts
- cat $SNAP/parts_meta_info || true
+ cat "$SNAP"/parts_meta_info || true
 # should always have parts info from content snap
- cat $CHECKBOX_RUNTIME/parts_meta_info
+ cat "$CHECKBOX_RUNTIME"/parts_meta_info
 environ: SNAP
 estimated_duration: 0.02
 _summary: Attaches an information about all parts that constituted this snap