[Fusionforge-commits] r12570 - trunk/tests/scripts

Christian Bayle cbayle at fusionforge.org
Fri Mar 4 17:13:11 CET 2011


Author: cbayle
Date: 2011-03-04 17:13:09 +0100 (Fri, 04 Mar 2011)
New Revision: 12570

Modified:
   trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
Log:
try to fix rpm build


Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-03-04 16:02:55 UTC (rev 12569)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-03-04 16:13:09 UTC (rev 12570)
@@ -6,26 +6,36 @@
 export CONFIG_PHP=func/config.php.buildbot
 export SELENIUM_RC_HOST=${SELENIUM_RC_HOST:-`hostname -i`}
 export SELENIUM_RC_DIR=$WORKSPACE/reports
+
 # get config 
 . tests/config/default
 if [ -f tests/config/`hostname` ] ; then . tests/config/`hostname`; fi
+
+export VEID=$VEIDCOS
+
+export LXCTEMPLATE=$LXCCOSTEMPLATE
+
+export IPBASE=$IPCOSBASE
+export IPDNS=$IPCOSDNS
+export IPMASK=$IPCOSMASK
+export IPGW=$IPCOSGW
+
+ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
+export VZTEMPLATE=centos-$COSVERS-$ARCH-minimal
+export VZPRIVATEDIR
+export HOST=centos5.local
+export DEBMIRROR
+
+export DIST
 export VMENGINE
 
 if [ "x${HUDSON_URL}" = "x" ]
 then
-	export VEID=$VEIDCOS
-	export IPBASE=$IPCOSBASE
-	export IPDNS=$IPCOSDNS
-	ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
-	export VZTEMPLATE=centos-$COSVERS-$ARCH-minimal
-	export VZPRIVATEDIR
-	export DIST
 	export BASEDIR=${BASEDIR:-/~`id -un`/ws}
+	export USEVZCTL=true
+	export SELENIUM_RC_HOST=localhost
 	export SELENIUM_RC_URL=http://`hostname -f`$BASEDIR/reports
 	export FFORGE_RPM_REPO=http://`hostname -f`$BASEDIR/build/packages
-	export HOST=centos5.local
-	export SELENIUM_RC_HOST=localhost
-	export USEVZCTL=true
 else
 	export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
 	export FFORGE_RPM_REPO=${HUDSON_URL}job/$JOB_NAME/ws/build/packages




More information about the Fusionforge-commits mailing list