Merge pull request #239 from tomponline/main

tests: Always use lxc stop -f (force)
canonical · Jul 12, 2024 · 85183be · 85183be
2 parents 363f274 + c1e5c99
commit 85183be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tests/gpu-container b/tests/gpu-container
@@ -86,7 +86,7 @@ sleep 1
 # Test nvidia runtime
 echo "==> Testing nvidia runtime"
 ! lxc exec c1 -- nvidia-smi || false
-lxc stop c1
+lxc stop -f c1
 lxc config set c1 nvidia.runtime true
 lxc start c1
 waitInstanceReady c1

diff --git a/tests/gpu-mig b/tests/gpu-mig
@@ -67,7 +67,7 @@ lxc exec nvidia-mig3 -- nvidia-smi
 lxc start nvidia-mig4
 lxc exec nvidia-mig4 -- nvidia-smi
 
-lxc stop nvidia-mig4
+lxc stop -f nvidia-mig4
 if [ -n "${identical_nvidia_gpus}" ]; then
   # XXX: if there are multiple identical cards the vendorid/productid combo isn't enough to identify the GPU so a
   #      PCI address would be needed as well but that's already been tested before
@@ -88,7 +88,7 @@ lxc exec nvidia-mig4 -- nvidia-smi
 lxc list
 
 # Stop all instances
-lxc stop --all
+lxc stop -f --all
 
 # Cleanup MIG
 nvidia-smi mig -dci

diff --git a/tests/maas b/tests/maas
@@ -99,7 +99,7 @@ sleep 10
 host "$(hostname)-c1.lab.maas.stgraber.net" 2602:fc62:b:10::2
 lxc list
 
-lxc stop "$(hostname)-c1"
+lxc stop -f "$(hostname)-c1"
 lxc profile assign "$(hostname)-c1" default
 lxc config device add "$(hostname)-c1" eth0 nic nictype=bridged parent=br0 maas.subnet.ipv4=MAAS-LAB-V4 maas.subnet.ipv6=MAAS-LAB-V6 ipv4.address=172.17.30.111 ipv6.address=2602:fc62:b:3000:2::111
 lxc start "$(hostname)-c1"

diff --git a/tests/storage-volumes-vm b/tests/storage-volumes-vm
@@ -80,7 +80,7 @@ do
 	sleep 3
 	! lxc exec v1 -- stat "$BLOCK_SPECIAL_FILE" || false
 	! lxc exec v1 -- stat /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_lxd_vol1 || false
-	lxc stop v1
+	lxc stop -f v1
 
 	echo "==> Backup custom block volume"
 	lxc storage volume export "${poolName}" vol1 vol1.tar.gz