Checkbox Provider - Base

Merge ~jocave/plainbox-provider-checkbox:lsusb-checkbox-runtime-var into plainbox-provider-checkbox:master

  1. Git
  2. lp:~jocave/plainbox-provider-checkbox
  3. lsusb-checkbox-runtime-var
  4. Merge into master
Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: c51f37b8c34142d5c2cb2225dd6ffeed4d9ac206
Merged at revision: 4f62a1dedd67e6d436351350563e7befd7c20a37
Proposed branch: ~jocave/plainbox-provider-checkbox:lsusb-checkbox-runtime-var
Merge into: plainbox-provider-checkbox:master
Diff against target: 75 lines (+7/-7)
3 files modified
units/info/jobs.pxu (+1/-1)
units/stress/boot.pxu (+5/-5)
units/usb/usb.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+378046@code.launchpad.net

Description of the change

Make sure that use of the python version of lsusb from checkbox-support finds a usb.ids database even when run in classic snaps

Requires:
https://code.launchpad.net/~jocave/checkbox-core-snap/+git/checkbox-core-snap/+merge/378037

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
2index e7ac3ea..e5ebf7d 100644
3--- a/units/info/jobs.pxu
4+++ b/units/info/jobs.pxu
5@@ -103,7 +103,7 @@ category_id: com.canonical.plainbox::info
6 user: root
7 command:
8 if [[ -v SNAP ]]; then
9- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids
10+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids
11 else
12 lsusb -vv | iconv -t 'utf-8' -c
13 fi
14diff --git a/units/stress/boot.pxu b/units/stress/boot.pxu
15index dcc0bf5..f4085aa 100644
16--- a/units/stress/boot.pxu
17+++ b/units/stress/boot.pxu
18@@ -48,7 +48,7 @@ plugin: shell
19 command:
20 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_original || true
21 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_original || true
22- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_original || true
23+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_original || true
24 environ: LD_LIBRARY_PATH
25 user: root
26 estimated_duration: 1s
27@@ -101,7 +101,7 @@ environ: LD_LIBRARY_PATH
28 command:
29 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
30 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
31- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
32+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
33 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
34 if [ $? -ne 0 ] ; then
35 echo "lspci mismatch during cycle 1"
36@@ -136,7 +136,7 @@ environ: LD_LIBRARY_PATH
37 command:
38 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
39 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
40- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
41+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
42 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
43 if [ $? -ne 0 ] ; then
44 echo "lspci mismatch during cycle {reboot_id}"
45@@ -205,7 +205,7 @@ environ: LD_LIBRARY_PATH
46 command:
47 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
48 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
49- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
50+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
51 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
52 if [ $? -ne 0 ] ; then
53 echo "lspci mismatch during cycle 1"
54@@ -240,7 +240,7 @@ environ: LD_LIBRARY_PATH
55 command:
56 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
57 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
58- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
59+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
60 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
61 if [ $? -ne 0 ] ; then
62 echo "lspci mismatch during cycle {reboot_id}"
63diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu
64index 7fc8976..77dd601 100644
65--- a/units/usb/usb.pxu
66+++ b/units/usb/usb.pxu
67@@ -7,7 +7,7 @@ estimated_duration: 1.0
68 command:
69 set -o pipefail
70 if [[ -v SNAP ]]; then
71- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
72+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
73 else
74 lsusb 2>/dev/null | sort || echo "No USB devices were detected" >&2
75 fi

Subscribers

People subscribed via source and target branches