X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fbuilds.sh;h=5bb1ac1b10fdd7a4ea35c070bc996b9e19825610;hb=ed8bb81b0ba629b54e89d021706031906759d459;hp=e8b60277c5fb960116227004a3572b022bf052cb;hpb=94c55d3d37bc5fa8c520026498cd2184e0a708a6;p=infrastructure.git

diff --git a/scripts/builds.sh b/scripts/builds.sh
index e8b6027..5bb1ac1 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -1,25 +1,40 @@
 #!/bin/bash
 
+# tentatively trash all qemu instances as the pool is broken with threesome tests
+manage-infrastructure.py -qrs >& /dev/null
+
 function liquid () { hostname | grep -q liquid ; }
 function reed () { hostname | grep -q reed ; }
 function velvet () { hostname | grep -q velvet ; }
 
-# 2.6.32 kernel on f14 - ongoing work - 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@--k32-f14-32
-# one is enough for now
-#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
+# the tests flavours available
+# -B means no test
+# default 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
+#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k22-tags.mk -f f8 -p linux32 -b @DATE@--k22-f8-32
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k22-tags.mk -f f8 -p linux64 -b @DATE@--k22-f8-64 
 
 # 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 # -c dual
-#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
+#reed && /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 
+reed && /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
 
-#### 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.32 kernel on f14 - ongoing work - needs 2.6.32
+# sfamesh currently does not finish with no antiloop; triangle hangs in sfi remove -t user
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--k32-f14-32 
+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
 
-# 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 # -c dual
-#reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linux64 -b @DATE@--k22-f8-64 -B
+# 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
+
+##############################
+#### 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 -t onelab-k22-tags.mk -f f12 -p linux32 -b @DATE@--k22-f12-32
+####liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k22-tags.mk -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
@@ -30,30 +45,13 @@ reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linu
 ####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-c55-32 
-#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f centos5 -p linux64 -b @DATE@--k22-c55-64 -B
-
-# wextoolbox variants
-### turning this off during vacations
-#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f12 -b @DATE@--wtx-f12-32
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k22-tags.mk -f centos5 -p linux32 -b @DATE@--k22-c55-32 
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k22-tags.mk -f centos5 -p linux64 -b @DATE@--k22-c55-64 -B
 
 ########################################
 ########## 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 -B
-# the 32bits version is not very useful
-#### 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 -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 -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 -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wtx-f10-32 -B
-
-#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wtx-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