From 8737baee7c8666b268bff88070ac93164d41470f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 27 Nov 2010 11:33:52 +1100 Subject: wintest: cope with VMs sometimes not rebooting my w2k8 image occasionally gets stuck in the early stages of booting. This adds code to detect a failed reboot, in which case the VM is reset Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Sat Nov 27 02:42:19 CET 2010 on sn-devel-104 --- wintest/conf/abartlet.conf | 1 + wintest/conf/tridge.conf | 1 + 2 files changed, 2 insertions(+) (limited to 'wintest/conf') diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf index f775c81b3a..00578f437d 100644 --- a/wintest/conf/abartlet.conf +++ b/wintest/conf/abartlet.conf @@ -12,6 +12,7 @@ DEBUGLEVEL : 1 # commands to control VMs VM_POWEROFF : virsh destroy ${VMNAME} VM_RESTORE : virsh snapshot-revert ${VMNAME} ${SNAPSHOT} +VM_RESET : virsh reboot ${VMNAME} # interfaces to create INTERFACE : virbr0:0 diff --git a/wintest/conf/tridge.conf b/wintest/conf/tridge.conf index 1c7ed0bda7..72b54d88da 100644 --- a/wintest/conf/tridge.conf +++ b/wintest/conf/tridge.conf @@ -12,6 +12,7 @@ DEBUGLEVEL : 1 # commands to control VMs VM_POWEROFF : su tridge -c "VBoxManage controlvm ${VMNAME} poweroff" VM_RESTORE : su tridge -c "VBoxManage snapshot ${VMNAME} restore ${SNAPSHOT} && VBoxManage startvm ${VMNAME}" +VM_RESET : su tridge -c "VBoxManage controlvm ${VMNAME} reset" # interfaces to listen on INTERFACE : virbr0:0 -- cgit