[Fusionforge-commits] r10960 - trunk/tests/scripts
Christian Bayle
cbayle at libremir.placard.fr.eu.org
Tue Oct 12 16:20:24 CEST 2010
Author: cbayle
Date: 2010-10-12 16:20:23 +0200 (Tue, 12 Oct 2010)
New Revision: 10960
Modified:
trunk/tests/scripts/fusionforge-build-and-test-deb.sh
trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
trunk/tests/scripts/start_vz.sh
Log:
Started vztemplate is a parameter
Modified: trunk/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-deb.sh 2010-10-12 13:46:30 UTC (rev 10959)
+++ trunk/tests/scripts/fusionforge-build-and-test-deb.sh 2010-10-12 14:20:23 UTC (rev 10960)
@@ -24,6 +24,7 @@
export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
export FFORGE_RPM_REPO=${HUDSON_URL}job/$JOB_NAME/ws/build/packages
export HOST=debian6.local
+ export VZTEMPLATE=debian-$DEBVERS-$ARCH-minimal
fi
export DB_NAME=gforge
export CONFIGURED=true
Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh 2010-10-12 13:46:30 UTC (rev 10959)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh 2010-10-12 14:20:23 UTC (rev 10960)
@@ -24,6 +24,7 @@
export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
export FFORGE_RPM_REPO=${HUDSON_URL}job/$JOB_NAME/ws/build/packages
export HOST=centos52.local
+ export VZTEMPLATE=centos-5-x86
fi
export DB_NAME=gforge
export CONFIGURED=true
Modified: trunk/tests/scripts/start_vz.sh
===================================================================
--- trunk/tests/scripts/start_vz.sh 2010-10-12 13:46:30 UTC (rev 10959)
+++ trunk/tests/scripts/start_vz.sh 2010-10-12 14:20:23 UTC (rev 10960)
@@ -1,7 +1,7 @@
#!/bin/sh
VZHOST=$1
-if sudo /root/start_vz.sh centos-5-x86 "$1"
+if sudo /root/start_vz.sh $VZTEMPLATE "$1"
then
echo "VM Started"
else
More information about the Fusionforge-commits
mailing list