cleanup - all on buzzcocks works fine - put back the sfa build as well

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 1ee4244..ef26454 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -15,43 +15,31 @@
 # -c config -c sfadebug - turn on sfa debug
 # -y pg testing only the pg rspecs
 
-function liquid () { hostname | grep -q liquid ; }
-function reed () { hostname | grep -q reed ; }
+# XXX historically we had several build boxes
+#function liquid () { hostname | grep -q liquid ; }
+#function reed () { hostname | grep -q reed ; }
 function buzzcocks () { hostname | grep -q buzzcocks ; }
 
-# for emanicslab
-#liquid & /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20-nmt nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@nodemanager-5.2-15 -i check-initscripts -i ssh-slice-again
-#liquid & /root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21-nmt nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@nodemanager-5.2-15 -i check-initscripts 
-
 buzzcocks && /root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21 -i check-initscripts &
 
-# should be good now on buzzcocks
-buzzcocks      && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18 &
-
 [ -n "$SINGLE" ] && exit
 
 buzzcocks && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20 -i check-initscripts &
-
-# not sure this is still needed
-#buzzcocks && /root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21-nois -c default -c no_initscript &
-#buzzcocks && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20-nois -c default -c no_initscript &
-
-# cannot build this one from within buzzcocks yet
-# buzzcocks && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18 &
-
+buzzcocks && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18 &
 buzzcocks && /root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab &
 
+### sfa from branch
+buzzcocks  && /root/bin/lbuild-nightly.sh sfa-GITPATH=git://git.onelab.eu/sfa.git@master tests-GITPATH=git://git.onelab.eu/tests.git@master -f f21 -b @DATE@--f21-sfa
+
 exit
 
+
 ########## oldies
 
 #liquid    && /root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab
 #liquid    && /root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21
 #reed      && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20
 
-### sfa from branch
-buzzcocks  && /root/bin/lbuild-nightly.sh sfa-GITPATH=git://git.onelab.eu/sfa.git@master tests-GITPATH=git://git.onelab.eu/tests.git@master -f f21 -b @DATE@--f21-sfa
-
 ###  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