[Fusionforge-commits] r14898 - in branches/Branch_5_1/tests: config scripts

Alain Peyrat aljeux at fusionforge.org
Sun Nov 20 16:42:30 CET 2011


Author: aljeux
Date: 2011-11-20 16:42:30 +0100 (Sun, 20 Nov 2011)
New Revision: 14898

Added:
   branches/Branch_5_1/tests/config/build
Modified:
   branches/Branch_5_1/tests/config/default
   branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh
Log:
Use alternative vztemplate

Added: branches/Branch_5_1/tests/config/build
===================================================================
--- branches/Branch_5_1/tests/config/build	                        (rev 0)
+++ branches/Branch_5_1/tests/config/build	2011-11-20 15:42:30 UTC (rev 14898)
@@ -0,0 +1,8 @@
+#
+# In this file you can find vars that are useable 
+# both as an include in a Makefile or
+# be sourced in a shell
+# So it should only be stuffs like VAR=value
+#
+REMOTESELENIUM=true
+VZTEMPLATE=centos-5-x86-test

Modified: branches/Branch_5_1/tests/config/default
===================================================================
--- branches/Branch_5_1/tests/config/default	2011-11-18 18:26:23 UTC (rev 14897)
+++ branches/Branch_5_1/tests/config/default	2011-11-20 15:42:30 UTC (rev 14898)
@@ -28,6 +28,7 @@
 VZPRIVATEDIR=/var/lib/vz/private
 # You shouldn't change the next line, don't really work
 VZTEMPLATEDIR=/var/lib/vz/template
+VZTEMPLATE=centos-5-x86
 
 SSHPUBKEY=~/.ssh/id_rsa.pub
 HOSTKEYDIR=~/ssh

Modified: branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-18 18:26:23 UTC (rev 14897)
+++ branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-20 15:42:30 UTC (rev 14898)
@@ -26,8 +26,7 @@
 export IPMASK=$IPCOSMASK
 export IPGW=$IPCOSGW
 
-ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
-export VZTEMPLATE=centos-$COSVERS-$ARCH-minimal
+export VZTEMPLATE
 export VZPRIVATEDIR
 export DEBMIRROR
 
@@ -44,7 +43,6 @@
 	export SELENIUM_RC_URL=http://`hostname -f`$BASEDIR/reports
 else
 	export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
-	export VZTEMPLATE=centos-5-x86
 fi
 export DB_NAME=gforge
 export CONFIGURED=true




More information about the Fusionforge-commits mailing list