X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fbuilds.sh;h=a7e9b1e36592387f7dbc4fb309b860bea0207f86;hb=2c3a58eb4ffbd490b119f7542fecf9822e22779f;hp=b7a3cd9c02923fcd2fffa9ff37decb74f4436bbf;hpb=44f2e771685143fc45f449b301461728a855de47;p=infrastructure.git

diff --git a/scripts/builds.sh b/scripts/builds.sh
index b7a3cd9..a7e9b1e 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -1,51 +1,47 @@
 #!/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 ] ; }
+# tentatively trash all qemu instances as the pool is broken with threesome tests
+manage-infrastructure.py -qrs >& /dev/null
 
-# 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
-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
+# test the 32 builds with a single plc, tests tend to fail with a triangle setup
+# probably due to 32bits qemu machines being much slower
+# another approach would be to increase the ssh_slice timeout
 
-# 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
+function liquid () { hostname | grep -q liquid ; }
+function reed () { hostname | grep -q reed ; }
+function velvet () { hostname | grep -q velvet ; }
 
-# 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
-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
+# the tests flavours available
+# -B means no test
+# default for the tests setup is one myplc
+# -c dual has two myplc's - pointing to each other AMs
+# -c triangle has three - ditto
+# -c sfamesh makes them point to SMs
 
-# 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
-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 f8
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f8 -p linux32 -b @DATE@--f8-32
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f f8 -p linux64 -b @DATE@--f8-64 -c triangle -c sfamesh
+# 2.6.32 kernel on f15 is broken
+# liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f15 -p linux64 -b @DATE@--f15-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
-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
+# 2.6.27 kernel on f12
+reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f12 -p linux32 -b @DATE@--f12-32-sfasl sfa-GITPATH=git://git.f-lab.fr/sfa.git@senslab
+reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f12 -p linux64 -b @DATE@--f12-64 -c triangle -c sfamesh
 
-# 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
+# f14 - needs 2.6.32
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--f14-32-sfagen sfa-GITPATH=git://git.f-lab.fr/sfa.git@generic
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64 -c triangle -c sfamesh
+# test sfa with loops
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--k32-f14-64 -c triangle -c sfamesh
 
-# wextoolbox variants                                                                                                                   
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32 
+# wextoolbox on f14 (gnuradio is in f14 only)
+#reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32
+#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux64 -f f14 -b @DATE@--wtx-f14-64
 
-########## f12 bootstrap : 2.6.31, util-vserver and yum, for a plain fedora 12 build or test box
+########################################
+########## f12 bootstrap : vserver-capa2.6.32, 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 -m build@onelab.eu   -d f12 -f f12 -p linux64 -b @DATE@--f12-f12-64
-########## liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32
-
-########## f10 : shouldn't be needed anymore
-## 2.6.27 kernel on f10
-#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
-#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 -m build@onelab.eu   -d onelab -f f10 -p linux32 -b @DATE@--k22-f10-32
-#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 -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 f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
+### same software release but built on f14 - kernel excluded as, 
+# for some reason, we have to use the one built on f12
+#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d f14 -f f14 -p linux64 -b @DATE@--f14-f14-64 -B