[Fusionforge-commits] r12453 - in trunk/tests: config lxc openvz scripts

Christian Bayle cbayle at fusionforge.org
Tue Mar 1 00:21:54 CET 2011


Author: cbayle
Date: 2011-03-01 00:21:54 +0100 (Tue, 01 Mar 2011)
New Revision: 12453

Added:
   trunk/tests/config/christian
   trunk/tests/config/default
   trunk/tests/config/g-dellm65-1
   trunk/tests/config/g-virtual05
Removed:
   trunk/tests/lxc/config.christian
   trunk/tests/lxc/config.default
   trunk/tests/lxc/config.g-virtual05
   trunk/tests/openvz/config.christian
   trunk/tests/openvz/config.default
   trunk/tests/openvz/config.g-dellm65-1
   trunk/tests/openvz/config.g-virtual05
Modified:
   trunk/tests/lxc/Makefile
   trunk/tests/openvz/Makefile
   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:
Share config between openvz and lxc


Copied: trunk/tests/config/christian (from rev 12452, trunk/tests/openvz/config.christian)
===================================================================
--- trunk/tests/config/christian	                        (rev 0)
+++ trunk/tests/config/christian	2011-02-28 23:21:54 UTC (rev 12453)
@@ -0,0 +1,26 @@
+#
+# 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
+#
+VEIDDEB=105
+VEIDCEN=110
+
+DEBVERS=6.0
+CENTVERS=5.5
+
+IPDEBBASE=192.168.50
+IPDEBDNS=192.168.50.5
+
+IPCENTOSBASE=192.168.50
+IPCENTOSDNS=192.168.50.5
+
+VZPRIVATEDIR=/data/openvz/private
+# You shouldn't change the next line, don't really work
+VZTEMPLATEDIR=/var/lib/vz/template
+
+USERCLIENT=chris
+
+DEBMIRROR=http://christian.bayle.eu/debian
+DIST=squeeze

Copied: trunk/tests/config/default (from rev 12452, trunk/tests/openvz/config.default)
===================================================================
--- trunk/tests/config/default	                        (rev 0)
+++ trunk/tests/config/default	2011-02-28 23:21:54 UTC (rev 12453)
@@ -0,0 +1,25 @@
+#
+# 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
+#
+VEIDDEB=105
+VEIDCEN=110
+
+DEBVERS=6.0
+CENTVERS=5.5
+
+IPDEBBASE=192.168.222
+IPDEBDNS=192.168.222.1
+
+IPCENTOSBASE=192.168.222
+IPCENTOSDNS=192.168.222.1
+
+VZPRIVATEDIR=/var/lib/vz/private
+# You shouldn't change the next line, don't really work
+VZTEMPLATEDIR=/var/lib/vz/template
+
+USERCLIENT=root
+
+DIST=squeeze

Copied: trunk/tests/config/g-dellm65-1 (from rev 12452, trunk/tests/openvz/config.g-dellm65-1)
===================================================================
--- trunk/tests/config/g-dellm65-1	                        (rev 0)
+++ trunk/tests/config/g-dellm65-1	2011-02-28 23:21:54 UTC (rev 12453)
@@ -0,0 +1,27 @@
+
+#
+# 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
+#
+VEIDDEB=105
+VEIDCEN=110
+
+DEBVERS=6.0
+CENTVERS=5.5
+
+IPDEBBASE=10.194.10
+IPDEBDNS=10.194.11.20
+
+IPCENTOSBASE=10.194.10
+IPCENTOSDNS=10.194.11.20
+
+VZPRIVATEDIR=/var/lib/vz/private
+# You shouldn't change the next line, don't really work
+VZTEMPLATEDIR=/var/lib/vz/template
+
+SSHPUBKEY=~buildbot/.ssh/id_rsa.pub
+
+DIST=squeeze
+DEBMIRROR=http://10.194.10.128/debian

Copied: trunk/tests/config/g-virtual05 (from rev 12452, trunk/tests/openvz/config.g-virtual05)
===================================================================
--- trunk/tests/config/g-virtual05	                        (rev 0)
+++ trunk/tests/config/g-virtual05	2011-02-28 23:21:54 UTC (rev 12453)
@@ -0,0 +1,28 @@
+
+#
+# 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
+#
+VEIDDEB=105
+VEIDCEN=110
+
+DEBVERS=6.0
+CENTVERS=5.5
+
+IPDEBBASE=10.194.10
+IPDEBDNS=10.194.11.20
+IPDEBDOMAIN=rd.francetelecom.fr
+
+IPCENTOSBASE=10.194.10
+IPCENTOSDNS=10.194.11.20
+
+VZPRIVATEDIR=/var/lib/vz/private
+# You shouldn't change the next line, don't really work
+VZTEMPLATEDIR=/var/lib/vz/template
+
+SSHPUBKEY=~admrsc/.ssh/id_rsa.pub
+
+DIST=squeeze
+DEBMIRROR=http://g-rub.rd.francetelecom.fr:3142/debian

Modified: trunk/tests/lxc/Makefile
===================================================================
--- trunk/tests/lxc/Makefile	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/lxc/Makefile	2011-02-28 23:21:54 UTC (rev 12453)
@@ -2,8 +2,8 @@
 VMROOT=/var/lib/lxc/vmdebian6
 SSHPUBKEY=~$(USERCLIENT)/.ssh/id_rsa.pub
 
--include config.default
--include config.$(shell hostname)
+-include ../config/default
+-include ../config/$(shell hostname)
 
 default: vmdebian6-config netstaticdeb installkey
 	@echo "read the Makefile to see available targets"

Deleted: trunk/tests/lxc/config.christian
===================================================================
--- trunk/tests/lxc/config.christian	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/lxc/config.christian	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,26 +0,0 @@
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=192.168.50
-IPDEBDNS=192.168.50.5
-
-IPCENTOSBASE=192.168.50
-IPCENTOSDNS=192.168.50.5
-
-VZPRIVATEDIR=/data/openvz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-USERCLIENT=chris
-
-DEBMIRROR=http://christian.bayle.eu/debian
-DIST=squeeze

Deleted: trunk/tests/lxc/config.default
===================================================================
--- trunk/tests/lxc/config.default	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/lxc/config.default	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,25 +0,0 @@
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=192.168.222
-IPDEBDNS=192.168.222.1
-
-IPCENTOSBASE=192.168.222
-IPCENTOSDNS=192.168.222.1
-
-VZPRIVATEDIR=/var/lib/vz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-USERCLIENT=root
-
-DIST=squeeze

Deleted: trunk/tests/lxc/config.g-virtual05
===================================================================
--- trunk/tests/lxc/config.g-virtual05	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/lxc/config.g-virtual05	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,28 +0,0 @@
-
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=10.194.10
-IPDEBDNS=10.194.11.20
-IPDEBDOMAIN=rd.francetelecom.fr
-
-IPCENTOSBASE=10.194.10
-IPCENTOSDNS=10.194.11.20
-
-VZPRIVATEDIR=/var/lib/vz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-SSHPUBKEY=~admrsc/.ssh/id_rsa.pub
-
-DIST=squeeze
-DEBMIRROR=http://g-rub.rd.francetelecom.fr:3142/debian

Modified: trunk/tests/openvz/Makefile
===================================================================
--- trunk/tests/openvz/Makefile	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/openvz/Makefile	2011-02-28 23:21:54 UTC (rev 12453)
@@ -14,10 +14,10 @@
 SSHPUBKEY=~$(USERCLIENT)/.ssh/id_rsa.pub
 
 # Default config
-include config.default
+include ../config/default
 
 # Optional local change
--include config.$(shell hostname)
+-include ../config/$(shell hostname)
 
 # Local customization can be done using a local.<hostname> file
 # This is convenient if you use local mirror

Deleted: trunk/tests/openvz/config.christian
===================================================================
--- trunk/tests/openvz/config.christian	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/openvz/config.christian	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,25 +0,0 @@
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=192.168.50
-IPDEBDNS=192.168.50.5
-
-IPCENTOSBASE=192.168.50
-IPCENTOSDNS=192.168.50.5
-
-VZPRIVATEDIR=/data/openvz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-USERCLIENT=chris
-
-DIST=squeeze

Deleted: trunk/tests/openvz/config.default
===================================================================
--- trunk/tests/openvz/config.default	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/openvz/config.default	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,25 +0,0 @@
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=192.168.222
-IPDEBDNS=192.168.222.1
-
-IPCENTOSBASE=192.168.222
-IPCENTOSDNS=192.168.222.1
-
-VZPRIVATEDIR=/var/lib/vz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-USERCLIENT=root
-
-DIST=squeeze

Deleted: trunk/tests/openvz/config.g-dellm65-1
===================================================================
--- trunk/tests/openvz/config.g-dellm65-1	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/openvz/config.g-dellm65-1	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,27 +0,0 @@
-
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=10.194.10
-IPDEBDNS=10.194.11.20
-
-IPCENTOSBASE=10.194.10
-IPCENTOSDNS=10.194.11.20
-
-VZPRIVATEDIR=/var/lib/vz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-SSHPUBKEY=~buildbot/.ssh/id_rsa.pub
-
-DIST=squeeze
-DEBMIRROR=http://10.194.10.128/debian

Deleted: trunk/tests/openvz/config.g-virtual05
===================================================================
--- trunk/tests/openvz/config.g-virtual05	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/openvz/config.g-virtual05	2011-02-28 23:21:54 UTC (rev 12453)
@@ -1,27 +0,0 @@
-
-#
-# 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
-#
-VEIDDEB=105
-VEIDCEN=110
-
-DEBVERS=6.0
-CENTVERS=5.5
-
-IPDEBBASE=10.194.10
-IPDEBDNS=10.194.11.20
-
-IPCENTOSBASE=10.194.10
-IPCENTOSDNS=10.194.11.20
-
-VZPRIVATEDIR=/var/lib/vz/private
-# You shouldn't change the next line, don't really work
-VZTEMPLATEDIR=/var/lib/vz/template
-
-SSHPUBKEY=~admrsc/.ssh/id_rsa.pub
-
-DIST=squeeze
-DEBMIRROR=http://10.194.10.128/debian

Modified: trunk/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-02-28 23:21:54 UTC (rev 12453)
@@ -6,10 +6,12 @@
 export CONFIG_PHP=func/config.php.buildbotDEB
 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
+
 if [ "x${HUDSON_URL}" = "x" ]
 then
-	. tests/openvz/config.default
-	if [ -f tests/openvz/config.`hostname` ] ; then . tests/openvz/config.`hostname`; fi
 	export VEID=$VEIDDEB
 	export IPBASE=$IPDEBBASE
 	export IPDNS=$IPDEBDNS
@@ -25,8 +27,6 @@
 	export SELENIUM_RC_HOST=localhost
 	export USEVZCTL=true
 else
-	. tests/openvz/config.default
-	if [ -f tests/openvz/config.`hostname` ] ; then . tests/openvz/config.`hostname`; fi
 	ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
 	export VZTEMPLATE=debian-$DEBVERS-$ARCH-minimal
 	export VZPRIVATEDIR

Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-02-28 23:21:54 UTC (rev 12453)
@@ -6,10 +6,12 @@
 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
+
 if [ "x${HUDSON_URL}" = "x" ]
 then
-	. tests/openvz/config.default
-	if [ -f tests/openvz/config.`hostname` ] ; then . tests/openvz/config.`hostname`; fi
 	export VEID=$VEIDCEN
 	export IPBASE=$IPCENTOSBASE
 	export IPDNS=$IPCENTOSDNS

Modified: trunk/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-02-28 23:21:43 UTC (rev 12452)
+++ trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-02-28 23:21:54 UTC (rev 12453)
@@ -6,10 +6,12 @@
 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
+
 if [ "x${HUDSON_URL}" = "x" ]
 then
-	. tests/openvz/config.default
-	if [ -f tests/openvz/config.`hostname` ] ; then . tests/openvz/config.`hostname`; fi
 	export VEID=$VEIDCEN
 	export IPBASE=$IPCENTOSBASE
 	export IPDNS=$IPCENTOSDNS




More information about the Fusionforge-commits mailing list