[Fusionforge-commits] r12667 - in trunk/tests: config scripts

Christian Bayle cbayle at fusionforge.org
Fri Mar 11 00:30:17 CET 2011


Author: cbayle
Date: 2011-03-11 00:30:17 +0100 (Fri, 11 Mar 2011)
New Revision: 12667

Modified:
   trunk/tests/config/christian
   trunk/tests/config/default
   trunk/tests/scripts/fusionforge-build-and-test-deb.sh
   trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
   trunk/tests/scripts/fusionforge-build-and-test-source.sh
Log:
Allow to keep vm alive at end of tests


Modified: trunk/tests/config/christian
===================================================================
--- trunk/tests/config/christian	2011-03-10 23:30:05 UTC (rev 12666)
+++ trunk/tests/config/christian	2011-03-10 23:30:17 UTC (rev 12667)
@@ -19,3 +19,5 @@
 DEBMIRROR=http://christian.bayle.eu/debian
 DEBMIRRORSEC=http://christian.bayle.eu/debian-security
 VMENGINE=lxc
+REMOTESELENIUM=true
+KEEPVM=true

Modified: trunk/tests/config/default
===================================================================
--- trunk/tests/config/default	2011-03-10 23:30:05 UTC (rev 12666)
+++ trunk/tests/config/default	2011-03-10 23:30:17 UTC (rev 12667)
@@ -34,3 +34,5 @@
 
 DIST=squeeze
 VMENGINE=vz
+REMOTESELENIUM=false
+KEEPVM=false

Modified: trunk/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-03-10 23:30:05 UTC (rev 12666)
+++ trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-03-10 23:30:17 UTC (rev 12667)
@@ -58,6 +58,11 @@
 (cd 3rd-party/php-mail-mbox ; make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rsqueeze)
 make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rsqueeze
 
+if $KEEPVM 
+then
+	echo "Destroying vm $HOST"
+	(cd tests/scripts ; sh ./stop_vm.sh $HOST)
+fi
 (cd tests/scripts ; ./start_vm.sh $HOST)
 scp -r tests root@$HOST:/root
 ssh root@$HOST "cat /root/tests/preseed/* | LANG=C debconf-set-selections"
@@ -87,8 +92,12 @@
 	scp -r root@$HOST:/var/log $SELENIUM_RC_DIR
 fi
 cd ..
+if $KEEPVM 
+then
+	echo "Keeping vm $HOST alive"
+else
+	(cd tests/scripts ; sh ./stop_vm.sh $HOST)
+fi
 
-(cd tests/scripts ; sh ./stop_vm.sh $HOST)
-
 cp $WORKSPACE/reports/phpunit-selenium.xml $WORKSPACE/reports/phpunit-selenium.xml.org
 xalan -in $WORKSPACE/reports/phpunit-selenium.xml.org -xsl fix_phpunit.xslt -out $WORKSPACE/reports/phpunit-selenium.xml

Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-03-10 23:30:05 UTC (rev 12666)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-03-10 23:30:17 UTC (rev 12667)
@@ -56,6 +56,11 @@
 sed -i "s#http://fusionforge.org/#${HUDSON_URL}#" $WORKSPACE/build/packages/fusionforge.repo
 sed -i "s#baseurl = .*#baseurl = $FFORGE_RPM_REPO/#" $WORKSPACE/build/packages/fusionforge.repo
 
+if $KEEPVM
+then
+	echo "Destroying vm $HOST"
+	(cd tests/scripts ; sh ./stop_vm.sh $HOST)
+fi
 (cd tests/scripts ; sh ./start_vm.sh $HOST)
 scp -r tests root@$HOST:/root
 ssh root@$HOST "ln -s gforge /usr/share/src"
@@ -83,8 +88,12 @@
 	scp -r root@$HOST:/var/log $SELENIUM_RC_DIR
 fi
 cd ..
+if $KEEPVM 
+then
+	echo "Keeping vm $HOST alive"
+else
+	(cd tests/scripts ; sh ./stop_vm.sh $HOST)
+fi
 
-(cd tests/scripts ; sh ./stop_vm.sh $HOST)
-
 cp $WORKSPACE/reports/phpunit-selenium.xml $WORKSPACE/reports/phpunit-selenium.xml.org
 xalan -in $WORKSPACE/reports/phpunit-selenium.xml.org -xsl fix_phpunit.xslt -out $WORKSPACE/reports/phpunit-selenium.xml

Modified: trunk/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-03-10 23:30:05 UTC (rev 12666)
+++ trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-03-10 23:30:17 UTC (rev 12667)
@@ -60,6 +60,11 @@
 sed -i "s#http://fusionforge.org/#${HUDSON_URL}#" $WORKSPACE/build/packages/fusionforge.repo
 sed -i "s#baseurl = .*#baseurl = $FFORGE_RPM_REPO/#" $WORKSPACE/build/packages/fusionforge.repo
 
+if $KEEPVM
+then
+	echo "Destroying vm $HOST"
+	(cd tests/scripts ; sh ./stop_vm.sh $HOST)
+fi
 (cd tests/scripts ; ./start_vm.sh $HOST)
 scp -r tests root@$HOST:/root
 if [ "x$BUILDRESULT" != "x" ]
@@ -86,8 +91,12 @@
 	scp -r root@$HOST:/var/log $SELENIUM_RC_DIR
 fi
 cd ..
+if $KEEPVM 
+then
+	echo "Keeping vm $HOST alive"
+else
+	(cd tests/scripts ; sh ./stop_vm.sh $HOST)
+fi
 
-(cd tests/scripts ; sh ./stop_vm.sh $HOST)
-
 cp $WORKSPACE/reports/phpunit-selenium.xml $WORKSPACE/reports/phpunit-selenium.xml.org
 xalan -in $WORKSPACE/reports/phpunit-selenium.xml.org -xsl fix_phpunit.xslt -out $WORKSPACE/reports/phpunit-selenium.xml




More information about the Fusionforge-commits mailing list