X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=2d0123bf9b95402c1726d15de485d77b4e8e9163;hb=26a60b05018f1edcd6691be1878bef08eb1d1c8c;hp=b9f81d53f008baae9648895a419c7c4596150e9e;hpb=1c779fa54d1d2bede86776220be82bbc5d7bd1d3;p=tests.git diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py index b9f81d5..2d0123b 100755 --- a/system/LocalSubstrate.inria.py +++ b/system/LocalSubstrate.inria.py @@ -19,19 +19,22 @@ class OnelabSubstrate (Substrate): return 'testmaster' # the build boxes we use - def build_boxes_spec (self): + def build_vs_boxes_spec (self): return [ 'liquid', 'reed', 'velvet' ] + # the experimental lxc-based build box + def build_lxc_boxes_spec (self): + return [ 'warhol' ] + # the vs-capable box for PLCs def plc_vs_boxes_spec (self): - return [ ('warhol', 35), # how many plcs max in this box - ] + return [ ] # the lxc-capable box for PLCs def plc_lxc_boxes_spec (self): return [ - ('gotan', 30), # how many plcs max in this box - ('deathvegas', 30), + ('gotan', 10), # how many plcs max in this box + ('deathvegas', 10), ] # vplc01 to 40 @@ -44,7 +47,9 @@ class OnelabSubstrate (Substrate): return [ # how many qemus max in this box # enfoui runs f18 - also can't seem to enter BIOS on that one ('kvm64-6', 4), # 4 cores, 8Gb - ('kvm64-1', 3), # 4 cores, 4Gb +# this used to be kruder, which is broken/dead +# we now have speedball installed but it is reserved for manual trials of libvirt/qemu +# this one is down ('kvm64-1', 3), # 4 cores, 4Gb ('kvm64-2', 3), # 4 cores, 4Gb ('kvm64-4', 2), # 4 cores, 8Gb ('kvm64-3', 1), # 2 cores, 4Gb