### have each box run one main distro build
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
+reed && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18
+velvet && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20
[ -n "$SINGLE" ] && exit
###
-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 -d myslice -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 -d myslice -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 -d myslice -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@-mm-w 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
+# bm on the ansible branch
+reed && /root/bin/lbuild-nightly.sh bootmanager-GITPATH=git://git.planet-lab.org/bootmanager.git@ansible -f f18 -b @DATE@--f18-ansbl
+# sfa from branch
+velvet && /root/bin/lbuild-nightly.sh sfa-GITPATH=git://git.planet-lab.org/sfa.git@geni-v3 -f f18 -b @DATE@--f18-sfa3
+
+### sfa + manifold + myslice
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@--f10n-deb-w debian -B
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@--f10n-deb-j debian -B
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring -b @DATE@--f10n-ubu-r debian -B
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy -b @DATE@--f10n-ubu-s debian -B
-########################################
-# debians & ubuntus for sfa
-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 -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)
### 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 -d f14 -f f14 -b @DATE@--f14-f14-64 -B
-