reviewed

diff --git a/scripts/builds.sh b/scripts/builds.sh
index f89d354..648e9d9 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -15,20 +15,18 @@ function velvet () { hostname | grep -q velvet ; }
 # -c sfamesh makes them point to SMs
 
 # 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@--k27-f8-32 -B
-liquid && /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 
+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 -B
+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 
 # 2.6.32 kernel on f15
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f15 -p linux64 -b @DATE@--k32-f15-64 -B
+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 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 linux64 -b @DATE@--k27-f12-64
-# 2.6.32 kernel on f12
-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 
+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 -B
+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
 
 # 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@--k32-f14-32 -B
-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
+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 -B
+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
 # 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
 
@@ -36,10 +34,6 @@ velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k
 #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
-
 ########################################
 ########## 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