use new scheme for selecting libvirt version on f18 and f20

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 4fa0c84..448b2ea 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -20,15 +20,17 @@ 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-lv104 -c default -c no_omf 
-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 -s git://git.onelab.eu/build.git@before_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 
+liquid && /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
+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 
+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
+# try 1.2.1 on f18
+velvet && /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
 
 ### 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