X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build-conf-planetlab.py;h=69d1bfb3281a70944dd7cea19d766e95141377bf;hb=refs%2Fheads%2Flxc_devel;hp=a56c5d50431b421a0824a83810a3a4fbde3c0a8b;hpb=f22f54f018cbe9606b64018f8414060449c53ae7;p=build.git

diff --git a/build-conf-planetlab.py b/build-conf-planetlab.py
index a56c5d50..69d1bfb3 100755
--- a/build-conf-planetlab.py
+++ b/build-conf-planetlab.py
@@ -1,20 +1,45 @@
 #!/usr/bin/python
+###
+# Nightly build spec HOWTO
+#
+# *  To add a 'build spec', define a dictionary as in the following examples, filling in the values you would like to override in the defaults. Any values you leave out
+# will get picked up from the defaults at the bottom of this fiel.
+#
+# *  A build spec may define multiple builds encapsulating various combinations of the available parameter options. To do so, 
+# set a parameter to a list, and the parent script will automatically turn it into the combinations it encloses. e.g., the following
+# build spec defines 6 separate builds:
+#
+# my_build = {
+#   'fcdistro':['centos5','f8','f10'],
+#   'personality':['linux32','linux65']
+#
+# * If your parameters have dependencies - e.g. you only want to build the linu64 personality on f10, then define the parameter as a lambda operating
+# on the current build spec. e.g. in this case, it would be to the effect of lambda (build): if (build['fcdistro']=='f10') then ['linux32','linux64'] else ['linux32']
+#
+
+#caglar_k32_build = {
+#	'tags':'planetlab-k32-tags.mk',
+#	'fcdistro':['f12', 'centos5','f8'],
+#	'personality':['linux32','linux64'],
+#	'test':0,
+#	'release':'k32'
+#}
 
-marcs_trunk_build = {
+sapans_k27_build = {
+	'tags':'planetlab-k27-tags.mk',
+	'fcdistro':['f12', 'centos5','f8'],
+	'personality':['linux32','linux64'],
+	'test':0,
+	'release':'k27'
+}
+
+marcs_k22_build = {
 	'tags':'planetlab-tags.mk',
-	'fcdistro':['centos5','f8'],
+	'fcdistro':['f12', 'centos5','f8'],
 	'personality':['linux32','linux64'],
 	'test': 0,
 	'release':'k22',
 }
-		
-sapans_k27_build = {
-	'tags':'k27-tags.mk',
-	'fcdistro':'centos5',
-	'personality':'linux32',
-	'test':1,
-	'release':'k27'
-}
 
 ###
 #
@@ -28,9 +53,9 @@ __flag_to_test__={0:'-B', 1:''}
 
 def __check_out_build_script__(build):
     import os
-    tmpname = os.popen('mktemp /tmp/'+build['build-script']+'.XXXXXX').read().rstrip('\n')
-    os.system("svn cat %s/%s > %s 2>/dev/null"%(build['svnpath'],build['build-script'],tmpname))
-    return tmpname
+    tmpname = os.popen('mktemp -d /tmp/'+build['build-script']+'.XXXXXX').read().rstrip('\n')
+    os.system("git clone --depth 1 %s %s" % (build['scmpath'], tmpname))
+    return "%s/%s" % (tmpname, build['build-script'])
 
 def __today__():
     import datetime
@@ -51,15 +76,13 @@ __default_build__ = {
 	'webpath':'/vservers/build.planet-lab.org/var/www/html/install-rpms/archive',
 	'pldistro':'planetlab',
 	'date': __today__(),
-	'svnpath':'http://svn.planet-lab.org/svn/build/trunk',
+	'scmpath':'git://git.planet-lab.org/build.git',
     'personality':'linux32',
     'myplcversion':'4.3',
 
-
 ### Parameters with dependencies: define paramater mappings as lambdas here
 
     'arch':lambda build: __personality_to_arch__[build['personality']],
     'runtests':lambda build: __flag_to_test__[build['test']],
     'vbuildnightly':lambda build: __check_out_build_script__(build)
-
 }