[Fusionforge-commits] FusionForge branch GUM updated. 43dab0be4e764b812581298661466091518b79d7

Sylvain Beucler beuc-inria at fusionforge.org
Fri Aug 29 18:53:18 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, GUM has been updated
       via  43dab0be4e764b812581298661466091518b79d7 (commit)
      from  a58f47ec294aff168e51a119aef11671b673ae4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 43dab0be4e764b812581298661466091518b79d7
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 29 18:53:14 2014 +0200

    testsuite: destroy VMs

diff --git a/tests/scripts/common-vm b/tests/scripts/common-vm
index f01f1d7..1a4a241 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 31ad053..c9da66c 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 40e25a1..59cea5e 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 c209f15..b4d9953 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"

-----------------------------------------------------------------------

Summary of changes:
 tests/scripts/common-vm                             |    7 +++++--
 tests/scripts/fusionforge-build-and-test-deb.sh     |    8 ++------
 tests/scripts/fusionforge-build-and-test-rpm.sh     |    3 ++-
 tests/scripts/fusionforge-build-and-test-src-deb.sh |    3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list