build only with libvirt-1.2.1 on both f18 and f20

diff --git a/scripts/builds.sh b/scripts/builds.sh
index ee8fe66..6730565 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -20,25 +20,21 @@ 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 lxc    -f f18 -p linux64 -b @DATE@--l18-lv121 -c default -c no_omf LIBVIRT=121
-reed   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -f f20 -p linux64 -b @DATE@--l20-lvms  -c default -c no_omf LIBVIRT=mainstream 
+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-lv121 -c default -c no_omf LIBVIRT=121
 velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -f f20 -p linux64 -b @DATE@--l20-lv121 -c default -c no_omf LIBVIRT=121
 
 [ -n "$SINGLE" ] && exit
 
 ### 
-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 onelab -f f14 -p linux64 -b @DATE@--sfa3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3
-velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -f f18 -p linux64 -b @DATE@--l18-lv104 -c default -c no_omf LIBVIRT=104
+liquid   && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--sfa3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3
 
-### f20 being the least demanding build we use this box for the debian stuff
-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@-manifold-w ALL=manifold manifold-debian -B
+### 
+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
-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@-manifold-j ALL=manifold manifold-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
-velvet && /root/bin/lbuild-nightly.sh -m build@onelab.eu -d lxc    -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring  -p linux64 -b @DATE@-manifold-r 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 raring  -p linux64 -b @DATE@-myslice-r  ALL=myslice  myslice-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@-manifold-s ALL=manifold manifold-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