X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=cca65663fb2f94d370dc7fdf609fda8e2060e573;hb=d65b1aa18412321e9b1083c8f9403682765b19b7;hp=1f7538cf21c3dc9ca8869f1b11b0ed9f02d5de22;hpb=394a339ab21946daf59691dbf1e0fb3ccd8222b3;p=tests.git diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py index 1f7538c..cca6566 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,7 @@ 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 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