diff options
| author | Jonathan Cave <jonathan.cave@canonical.com> | 2020-01-24 14:35:15 +0000 |
|---|---|---|
| committer | Jonathan Cave <jonathan.cave@canonical.com> | 2020-01-24 14:35:15 +0000 |
| commit | 8ed557d02507b2da23faadaff480ac787a622a0c (patch) | |
| tree | cec9fb71de1ae4036b35d8b82f0630910d0bb9a8 /units/stress | |
| parent | cdf88690fe4998d3e6e771d609b4d32f73da2667 (diff) | |
info/stress/usb: use CHECKBOX_RUNTIME variable
Make calls to checkbox-support-lsusb use the CHECKBOX_RUNTIME variable to find the usb.ids file.
Diffstat (limited to 'units/stress')
| -rw-r--r-- | units/stress/boot.pxu | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/units/stress/boot.pxu b/units/stress/boot.pxu index dcc0bf5..f4085aa 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}" |