From: Sylvain Beucler <sylvain.beucler@inria.fr>
Date: Fri, 29 Aug 2014 16:53:14 +0000 (+0200)
Subject: testsuite: destroy VMs
X-Git-Tag: v6.0rc1~661
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=43dab0be4e764b812581298661466091518b79d7

testsuite: destroy VMs
---

diff --git a/tests/scripts/common-vm b/tests/scripts/common-vm
index f01f1d7add..1a4a241e00 100644
--- a/tests/scripts/common-vm
+++ b/tests/scripts/common-vm
@@ -107,9 +107,12 @@ fi
 export VMTEMPLATE VMENGINE CIDR IPGW
 }
 
-destroy_vm()
+destroy_vm_if_not_keeped()
 {
-	tests/scripts/destroy_vm $@ || true
+	if ! $KEEPVM
+	then
+	    tests/scripts/destroy_vm $@ || true
+	fi
 }
 
 start_vm_if_not_keeped()
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 31ad0530a1..c9da66cde9 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -27,12 +27,8 @@ case $HOST in
 	;;
 esac	
 
-#conf=$(mktemp)
-#echo "lxc.network.link = virbr0" > $conf
-#echo "lxc.network.type = veth"  >> $conf
-#wsudo lxc-create -t $VM -n $HOST -t $conf
-#sudo lxc-start -n $HOST -d
-tests/scripts/start_vm -t $VM $HOST
+destroy_vm_if_not_keeped -t $VM $HOST
+start_vm_if_not_keeped -t $VM $HOST
 
 # LXC post-install...
 ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index 40e25a1ed4..59cea5e373 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -20,7 +20,8 @@ case $HOST in
 	;;
 esac	
 
-tests/scripts/start_vm -t $VM $HOST
+destroy_vm_if_not_keeped -t $VM $HOST
+start_vm_if_not_keeped -t $VM $HOST
 
 ssh root@$HOST "yum install -y rsync"
 rsync -av --delete src tests root@$HOST:/usr/src/fusionforge/
diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index c209f15ad9..b4d99536cf 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -27,7 +27,8 @@ case $HOST in
 	;;
 esac	
 
-tests/scripts/start_vm -t $VM $@
+destroy_vm_if_not_keeped -t $VM $HOST
+start_vm_if_not_keeped -t $VM $HOST
 
 # LXC post-install...
 ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"