X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=60086493dae27f7b1454e3fa896ff6dd23eafa9d;hb=dbeef18528cfec910b85da5bd7502338ce7c965c;hp=cc7b58ccf21bd6164827f9d13978226ea096f694;hpb=6a6e542cfe17abf30f1b8b6eda9ab1f6591c225c;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index cc7b58c..6008649 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
@@ -42,12 +45,13 @@ 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 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)