renumbered kvm boxes again

[tests.git] / system / LocalSubstrate.inria.py

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index cca6566..e5635b1 100755 (executable)
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -18,17 +18,9 @@ class OnelabSubstrate (Substrate):
    def test_box_spec (self):
       return 'testmaster'
 
-   # the build boxes we use 
-   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 [ ]
+      return [ 'liquid', 'reed', 'velvet' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
@@ -43,15 +35,22 @@ class OnelabSubstrate (Substrate):
                   'unused')                     # MAC address 
                 for i in range(1,41) ] 
 
+# as of jan 2014 this is renumbered so that 1 is preferred
    def qemu_boxes_spec (self):
-      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
-# this one is down         ('kvm64-1', 3), # 4 cores, 4Gb
+      return [ # (hostname, how many qemus max in this box)
+# speedball - old school but robust and a big disk
+         ('kvm64-1', 3), # 4 cores, 4Gb, 840 Gb
+# used to have kruder too, but it is broken/dead
+# dorfmeister
          ('kvm64-2', 3), # 4 cores, 4Gb
+# enfoui - can't seem to enter BIOS on that one
+         ('kvm64-3', 4), # 4 cores, 8Gb
+# estran - big mem but small disk
          ('kvm64-4', 2), # 4 cores, 8Gb
-         ('kvm64-3', 1), # 2 cores, 4Gb
+# lodos - rather old/small
          ('kvm64-5', 1), # 2 cores, 4Gb
+# cyblok         
+         ('kvm64-6', 1), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)