From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 29 Apr 2011 04:16:49 +0000 (+0200)
Subject: simpler tests for now
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8c7f9eaff0f8af5ae81353d187b51d747be6542a;p=infrastructure.git

simpler tests for now
---

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 5cfdd23..3d2ad6a 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -7,19 +7,24 @@ function liquid () { hostname | grep -q liquid ; }
 function reed () { hostname | grep -q reed ; }
 function velvet () { hostname | grep -q velvet ; }
 
+# 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 -c triangle -c sfamesh
-#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 # -c dual
+#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
-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 -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
-# the k32-f12 variant
-#reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f12 -p linux64 -b @DATE@--k32-f12-64
 
 # 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 -c triangle
+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
 
 # wextoolbox on f14 (gnuradio is in f14 only)
@@ -50,13 +55,3 @@ velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k
 # 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 -t onelab-k22-tags.mk -f f10 -p linux32 -b @DATE@--k22-f10-32 -B
-#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k22-tags.mk -f f10 -p linux64 -b @DATE@--k22-f10-64 -B
-#