### 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
+### sfa from branch
+velvet && /root/bin/lbuild-nightly.sh sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 tests-GITPATH=git://git.onelab.eu/tests.git@master -f f18 -b @DATE@--f18-sfa3
-### focus on building again, so only wheezy for now
-reed && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@--f10n-deb-w debian -B
-velvet && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@--f10n-deb-j debian -B
-reed && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring -b @DATE@--f10n-ubu-r debian -B
-velvet && /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
+### 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
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f trusty -b @DATE@--f10n-ubu-t debian -B
+### nodemanager: new rpm packaging for debian is not quite there yet
+velvet && /root/bin/lbuild-nightly.sh -d lxc -f trusty -P develdeb.pkgs -W http://debian.onelab.eu/ -b @DATE@--nm-ubu-t -B nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@debian ALL=nodemanager debian
+
####################
# wextoolbox
# bbn won't build so it's taken off that build -- see wexlxc.mk in wextoolbox (branch wexlxc)