X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fbuilds.sh;h=a090cabb0d1ece4ed7ccbaf5165f2bf99bf1c8d0;hb=d4cbd3dcec819849f7052f44a76ff4e5fdc67cc5;hp=4abb8049b84a9159915fc9d5636d34c3b1e7e966;hpb=4ea25c1d20539f152d1fc37195e63480d8c087cf;p=infrastructure.git

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 4abb804..a090cab 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -1,52 +1,51 @@
 #!/bin/bash
-# $Id$
-# $URL$
 
 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 -s git://git.onelab.eu/build -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
-liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -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 - known to be broken, node won't fly
-#liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f f12 -p linux32 -b @DATE@--k22-f12-32
-#liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f f12 -p linux64 -b @DATE@--k22-f12-64 -B
+#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 -s git://git.onelab.eu/build -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 -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f8 -p linux64 -b @DATE@--k27-f8-64 -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 -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f f8 -p linux32 -b @DATE@--k22-f8-32
-reed && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f f8 -p linux64 -b @DATE@--k22-f8-64 -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 -s git://git.onelab.eu/build -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 -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f centos5 -p linux64 -b @DATE@--k27-c55-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 -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f centos5 -p linux32 -b @DATE@--k22-c55-32 -B
-velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f centos5 -p linux64 -b @DATE@--k22-c55-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 -s git://git.onelab.eu/build -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32
-liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32 -B
+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
-########## liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d f12 -f f12 -p linux64 -b @DATE@--f12-f12-64 -B
-########## liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
+########## liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d f12 -f f12 -p linux64 -b @DATE@--f12-f12-64 -B
+########## liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
 
 ########## f10 : shouldn't be needed anymore
 ## 2.6.27 kernel on f10
-#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f10 -p linux32 -b @DATE@--k27-f10-32 -B
-#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f10 -p linux64 -b @DATE@--k27-f10-64 -B
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f10 -p linux32 -b @DATE@--k27-f10-32 -B
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f10 -p linux64 -b @DATE@--k27-f10-64 -B
 #
 ## 2.6.22 kernel on f10
-#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f f10 -p linux32 -b @DATE@--k22-f10-32 -B
-#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d onelab -f f10 -p linux64 -b @DATE@--k22-f10-64 -B
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f10 -p linux32 -b @DATE@--k22-f10-32 -B
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f10 -p linux64 -b @DATE@--k22-f10-64 -B
 #
-#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B