From 1920e0177cbecae7762434812537f3ebbb6683f0 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 13 Feb 2012 09:23:04 +0100 Subject: [PATCH] define 2 new builds for lxc on f14 and f16 --- scripts/builds.sh | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/scripts/builds.sh b/scripts/builds.sh index 20241a1..d1fed63 100755 --- a/scripts/builds.sh +++ b/scripts/builds.sh @@ -1,16 +1,5 @@ #!/bin/bash -# tentatively trash all qemu instances as the pool is broken with threesome tests -manage-infrastructure.py -qrs >& /dev/null - -# test the 32 builds with a single plc, tests tend to fail with a triangle setup -# probably due to 32bits qemu machines being much slower -# another approach would be to increase the ssh_slice timeout - -function liquid () { hostname | grep -q liquid ; } -function reed () { hostname | grep -q reed ; } -function velvet () { hostname | grep -q velvet ; } - # the tests flavours available # -B means no test # default for the tests setup is one myplc @@ -18,11 +7,15 @@ function velvet () { hostname | grep -q velvet ; } # -c triangle has three - ditto # -c sfamesh makes them point to SMs +function liquid () { hostname | grep -q liquid ; } +function reed () { hostname | grep -q reed ; } +function velvet () { hostname | grep -q velvet ; } + # 2.6.27 kernel on f8 liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f8 -p linux64 -b @DATE@--f8-64-tri -c triangle -c sfamesh sfa-GITPATH=git://git.onelab.eu/sfa.git@master liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f8 -p linux32 -b @DATE@--f8-32 sfa-GITPATH=git://git.onelab.eu/sfa.git@master -# 2.6.32 kernel on f15 is broken -# liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f15 -p linux64 -b @DATE@--f15-64 -B +# f16/lxc_devel +liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@lxc_devel -d planetlab -f f16 -p linux64 -b @DATE@--lxcdevel-16 -t planetlab-k32-tags.mk # 2.6.27 kernel on f12 #reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f12 -p linux64 -b @DATE@--f12-64 -c triangle -c sfamesh @@ -34,6 +27,8 @@ reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32 #velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64-pl -y pl velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64 sfa-GITPATH=git://git.onelab.eu/sfa.git@master velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--f14-32-alc sfa-GITPATH=git://git.onelab.eu/sfa.git@sqlalchemy -c default -c sfadebug +# f14/lxc +velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@lxc -d planetlab -f f14 -p linux64 -b @DATE@--lxc-14 -t planetlab-k32-tags.mk # wextoolbox on f14 (gnuradio is in f14 only) #reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32 -- 2.47.0