rename plain builds into k22

diff --git a/scripts/builds.sh b/scripts/builds.sh
index cd2b8bf..71d4ff5 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -6,44 +6,46 @@ function liquid () { [ $(basename $(hostname) .inria.fr) = liquid ] ; }
 function reed () { [ $(basename $(hostname) .inria.fr) = reed ] ; }
 function velvet () { [ $(basename $(hostname) .inria.fr) = velvet ] ; }
 
-### 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 -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
-
 # 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
 
-### old 2.6.22 kernel on f12 
-# can now build on f12 with tag -39-2
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f12 -p linux32 -b @DATE@--1l-f12-32
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f12 -p linux64 -b @DATE@--1l-f12-64 -B
-
-## 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@--1l-f10-32
-#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f10 -p linux64 -b @DATE@--1l-f10-64 -B
+# 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
 
 # 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
 
 # 2.6.22 kernel on f8
-reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linux32 -b @DATE@--1l-f8-32
-reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f f8 -p linux64 -b @DATE@--1l-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 -m build@onelab.eu   -d onelab -t onelab-k27-tags.mk -f centos5 -p linux32 -b @DATE@--k27-c54-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-c54-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@--1l-c54-32 -B
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -f centos5 -p linux64 -b @DATE@--1l-c54-64 -B
+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
 
-########## wextoolbox variants                                                                                                                   
-#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B
+# wextoolbox variants                                                                                                                   
 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 -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
+