testing wextool f12 instead of f10

[infrastructure.git] / scripts / builds.sh

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 2acaaa7..a090cab 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -1,18 +1,18 @@
 #!/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
-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 -B
-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
+# 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 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 -B
-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
@@ -23,15 +23,16 @@ reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linu
 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                                                                                                                   
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32 -B
+# wextoolbox variants
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32
 
 ########## f12 bootstrap : 2.6.31, util-vserver and yum, for a plain fedora 12 build or test box
 ########## enable on a need-by-need basis