X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=2d0123bf9b95402c1726d15de485d77b4e8e9163;hb=26a60b05018f1edcd6691be1878bef08eb1d1c8c;hp=9c7e7c7ef52e0e4f139d3076dc73a64e0c51748c;hpb=8dd9212c40098c225eed61133c3238fb5aab4dcf;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 9c7e7c7..2d0123b 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -19,19 +19,23 @@ class OnelabSubstrate (Substrate):
       return 'testmaster'
 
    # the build boxes we use 
-   def build_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet', 'gorillaz', 'deathvegas' ]
+   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', 35),  # how many plcs max in this box 
-               ('deathvegas', 35),  
-               ]  
+      return [ 
+         ('gotan', 10),         # how many plcs max in this box 
+         ('deathvegas', 10),    
+         ]  
 
    # vplc01 to 40
    def vplc_ips (self):
@@ -41,12 +45,15 @@ class OnelabSubstrate (Substrate):
 
    def qemu_boxes_spec (self):
       return [ # how many qemus max in this box
-         ('kvm64-1', 3), # 4 cores, 4Gb
+# enfoui runs f18 - also can't seem to enter BIOS on that one
+         ('kvm64-6', 4), # 4 cores, 8Gb
+# 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-3', 2), # 2 cores, 4Gb
-         ('kvm64-4', 1), # 4 cores, 8Gb
+         ('kvm64-4', 2), # 4 cores, 8Gb
+         ('kvm64-3', 1), # 2 cores, 4Gb
          ('kvm64-5', 1), # 2 cores, 4Gb
-         ('kvm64-6', 2), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)