X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fbuilds.sh;h=fee16d781af77af1438ed811afcbebfb01b609e7;hb=d0e89933724142b845abd7f108886f1a0c73419a;hp=ccdbf1c6cfa3230a90b7dbfef5e4275566559528;hpb=ee206d9963c0f5389187f075cbd822cffc96145a;p=infrastructure.git

diff --git a/scripts/builds.sh b/scripts/builds.sh
index ccdbf1c..fee16d7 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -1,36 +1,37 @@
 #!/bin/bash
-# $Id$
-# $URL$
 
-function liquid () { [ $(basename $(hostname) .inria.fr) = liquid ] ; }
-function reed () { [ $(basename $(hostname) .inria.fr) = reed ] ; }
-function velvet () { [ $(basename $(hostname) .inria.fr) = velvet ] ; }
+function liquid () { hostname | grep -q liquid ; }
+function reed () { hostname | grep -q reed ; }
+function velvet () { hostname | grep -q velvet ; }
 
 # 2.6.27 kernel on f12
+# default (i.e. without -s) should now be -s git://git.onelab.eu/build
 liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f12 -p linux32 -b @DATE@--k27-f12-32
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f12 -p linux64 -b @DATE@--k27-f12-64 -B
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f12 -p linux32 -b @DATE@--k27-f12-32-svn -B -s http://svn.planet-lab.org/svn/build/trunk
+#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f12 -p linux64 -b @DATE@--k27-f12-64 -B
 
-# 2.6.22 kernel on f12 
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f12 -p linux32 -b @DATE@--k22-f12-32
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f12 -p linux64 -b @DATE@--k22-f12-64 -B
+# 2.6.22 kernel on f12 - known to be broken, node won't fly
+#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f12 -p linux32 -b @DATE@--k22-f12-32
+#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f12 -p linux64 -b @DATE@--k22-f12-64 -B
 
 # 2.6.27 kernel on f8
-reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f8 -p linux32 -b @DATE@--k27-f8-32 -B
+reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f8 -p linux32 -b @DATE@--k27-f8-32
 reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f8 -p linux64 -b @DATE@--k27-f8-64 -B
 
 # 2.6.22 kernel on f8
-reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linux32 -b @DATE@--k22-f8-32 -B
+reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linux32 -b @DATE@--k22-f8-32
 reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linux64 -b @DATE@--k22-f8-64 -B
 
 # 2.6.27 kernel on c5
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f centos5 -p linux32 -b @DATE@--k27-c54-32 -B
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f centos5 -p linux64 -b @DATE@--k27-c54-64 -B
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f centos5 -p linux32 -b @DATE@--k27-c55-32 -B
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f centos5 -p linux64 -b @DATE@--k27-c55-64 -B
 
 # 2.6.22 kernel on c5
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f centos5 -p linux32 -b @DATE@--k22-c54-32 -B
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f centos5 -p linux64 -b @DATE@--k22-c54-64 -B
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f centos5 -p linux32 -b @DATE@--k22-c55-32 -B
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f centos5 -p linux64 -b @DATE@--k22-c55-64 -B
 
-# wextoolbox variants                                                                                                                   
+# wextoolbox variants
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32
 liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32 -B
 
 ########## f12 bootstrap : 2.6.31, util-vserver and yum, for a plain fedora 12 build or test box