info/stress/usb: use CHECKBOX_RUNTIME variable

Make calls to checkbox-support-lsusb use the CHECKBOX_RUNTIME variable to find the usb.ids file. 

3 files changed, 7 insertions, 7 deletions

diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index e7ac3ea5..e5ebf7dd 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -103,7 +103,7 @@ category_id: com.canonical.plainbox::info
 user: root
 command:
 if [[ -v SNAP ]]; then
- checkbox-support-lsusb -f $SNAP/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
diff --git a/units/stress/boot.pxu b/units/stress/boot.pxu
index dcc0bf5f..f4085aaf 100644
--- a/units/stress/boot.pxu
+++ b/units/stress/boot.pxu
@@ -48,7 +48,7 @@ plugin: shell
 command:
 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_original || true
 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_original || true
- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_original || true
+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_original || true
 environ: LD_LIBRARY_PATH
 user: root
 estimated_duration: 1s
@@ -101,7 +101,7 @@ environ: LD_LIBRARY_PATH
 command:
 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
 if [ $? -ne 0 ] ; then
 echo "lspci mismatch during cycle 1"
@@ -136,7 +136,7 @@ environ: LD_LIBRARY_PATH
 command:
 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
 if [ $? -ne 0 ] ; then
 echo "lspci mismatch during cycle {reboot_id}"
@@ -205,7 +205,7 @@ environ: LD_LIBRARY_PATH
 command:
 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
 if [ $? -ne 0 ] ; then
 echo "lspci mismatch during cycle 1"
@@ -240,7 +240,7 @@ environ: LD_LIBRARY_PATH
 command:
 lspci -i $SNAP/usr/share/misc/pci.ids > $PLAINBOX_SESSION_SHARE/lspci_test
 nmcli -t -f active,BSSID d w l | grep -oP "(?<=^yes:).*" > $PLAINBOX_SESSION_SHARE/wifi_test
- checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
+ checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids -s | sort > $PLAINBOX_SESSION_SHARE/lsusb_test
 diff -u $PLAINBOX_SESSION_SHARE/lspci_original $PLAINBOX_SESSION_SHARE/lspci_test
 if [ $? -ne 0 ] ; then
 echo "lspci mismatch during cycle {reboot_id}"
diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu
index 7fc89765..77dd6017 100644
--- a/units/usb/usb.pxu
+++ b/units/usb/usb.pxu
@@ -7,7 +7,7 @@ estimated_duration: 1.0
 command:
 set -o pipefail
 if [[ -v SNAP ]]; then
- 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
+ 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
 else
 lsusb 2>/dev/null | sort || echo "No USB devices were detected" >&2
 fi