defaults make this simpler

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 80604cd..f8dfd2a 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -20,44 +20,44 @@ function reed () { hostname | grep -q reed ; }
 function velvet () { hostname | grep -q velvet ; }
 
 ### have each box run one main distro build 
-liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--f14
-reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -f f18 -p linux64 -b @DATE@--l18 -c default -c no_omf
-velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -f f20 -p linux64 -b @DATE@--l20 -c default -c no_omf
+liquid && /root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab
+reed   && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--l18 -c default -c no_omf
+velvet && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--l20 -c default -c no_omf
 
 [ -n "$SINGLE" ] && exit
 
 ### 
-liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc -f f18 -p linux64 -b @DATE@--sfa3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3
+liquid && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--sfa3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3
 
 ### focus on building again, so only wheezy for now
-reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy  -p linux64 -b @DATE@-manifold-w ALL=manifold manifold-debian -B
-velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy  -p linux64 -b @DATE@-myslice-w  ALL=myslice  myslice-debian  -B
-#reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie  -p linux64 -b @DATE@-manifold-j ALL=manifold manifold-debian -B
-#velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie  -p linux64 -b @DATE@-myslice-j  ALL=myslice  myslice-debian  -B
-#reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy   -p linux64 -b @DATE@-manifold-s ALL=manifold manifold-debian -B
-#velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy   -p linux64 -b @DATE@-myslice-s  ALL=myslice  myslice-debian  -B
-
-
+reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@-manifold-w ALL=manifold manifold-debian -B
+velvet && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@-myslice-w  ALL=myslice  myslice-debian  -B
+# both in one build as myslice requires manifold
+reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@-mm ALL=manifold ALL+=myslice manifold-debian myslice-debian -B
+#reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@-manifold-j ALL=manifold manifold-debian -B
+#velvet && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@-myslice-j  ALL=myslice  myslice-debian  -B
+#reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy  -b @DATE@-manifold-s ALL=manifold manifold-debian -B
+#velvet && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy  -b @DATE@-myslice-s  ALL=myslice  myslice-debian  -B
  
 ########################################
 # debians  & ubuntus for sfa
-liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 -b @DATE@-sfa3-r ALL=sfa sfa-debian -B
-#reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f squeeze -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfasqueeze ALL=sfa sfa-debian -B
-###summer-mode###reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy  -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfawheezy ALL=sfa sfa-debian  -B
-#reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f oneiric -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaoneiric ALL=sfa sfa-debian -B
-#reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f precise -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaprecise ALL=sfa sfa-debian -B
-###summer-mode###reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f quantal -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaquantal ALL=sfa sfa-debian -B
+liquid && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 -b @DATE@-sfa3-r ALL=sfa sfa-debian -B
+#reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f squeeze sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfasqueeze ALL=sfa sfa-debian -B
+###summer-mode###reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfawheezy ALL=sfa sfa-debian  -B
+#reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f oneiric sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaoneiric ALL=sfa sfa-debian -B
+#reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f precise sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaprecise ALL=sfa sfa-debian -B
+###summer-mode###reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f quantal sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaquantal ALL=sfa sfa-debian -B
 
-###summer-mode###reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f quantal -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 -b @DATE@-sfa3quantal ALL=sfa sfa-debian -B
+###summer-mode###reed   && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f quantal sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 -b @DATE@-sfa3quantal ALL=sfa sfa-debian -B
 
 ####################
 # wextoolbox 
 # bbn won't build so it's taken off that build -- see wexlxc.mk in wextoolbox (branch wexlxc)
 #  f14
-#liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32 -e check_system_slice -c default -c bignode
+#liquid && /root/bin/lbuild-nightly.sh -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32 -e check_system_slice -c default -c bignode
 # f16
 # for now this is failing because the nodeimage plain (uncompressed) package is too big, cpio seems to have a 2Gb limit
-#liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d wexlxc -p linux64 -f f18 -b @DATE@--wexlxc-f18-64 -c default -c bignode
+#liquid && /root/bin/lbuild-nightly.sh -d wexlxc -f f18 -b @DATE@--wexlxc-f18-64 -c default -c bignode
 # f18 - never tried yet
 
 ###### senslab - not much to test 
@@ -65,8 +65,8 @@ liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.p
 
 ####################
 # build & test : f12 bootstrap : vserver-capable 2.6.32, util-vserver and yum, for a plain fedora 12 build or test box
-#liquid && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
+#liquid && /root/bin/lbuild-nightly.sh -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/lbuild-nightly.sh -m build@onelab.eu -d f14 -f f14 -p linux64 -b @DATE@--f14-f14-64 -B
+#liquid && /root/bin/lbuild-nightly.sh -d f14 -f f14 -b @DATE@--f14-f14-64 -B