git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renumbered kvm boxes again
[tests.git]
/
system
/
LocalSubstrate.inria.py
diff --git
a/system/LocalSubstrate.inria.py
b/system/LocalSubstrate.inria.py
index
c9573cf
..
e5635b1
100755
(executable)
--- a/
system/LocalSubstrate.inria.py
+++ b/
system/LocalSubstrate.inria.py
@@
-18,18
+18,10
@@
class OnelabSubstrate (Substrate):
def test_box_spec (self):
return 'testmaster'
def test_box_spec (self):
return 'testmaster'
- # the build boxes we use
- def build_vs_boxes_spec (self):
- return []
-
# the experimental lxc-based build box
def build_lxc_boxes_spec (self):
return [ 'liquid', 'reed', 'velvet' ]
# the experimental lxc-based build box
def build_lxc_boxes_spec (self):
return [ 'liquid', 'reed', 'velvet' ]
- # the vs-capable box for PLCs
- def plc_vs_boxes_spec (self):
- return [ ]
-
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
return [
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
return [
@@
-45,20
+37,20
@@
class OnelabSubstrate (Substrate):
# as of jan 2014 this is renumbered so that 1 is preferred
def qemu_boxes_spec (self):
# 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 - can't seem to enter BIOS on that one
- ('kvm64-1',
4), # 4 cores, 8
Gb
+ 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
# used to have kruder too, but it is broken/dead
# dorfmeister
('kvm64-2', 3), # 4 cores, 4Gb
-# estran - big meme but small disk
- ('kvm64-3', 2), # 4 cores, 8Gb
+# 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
# lodos - rather old/small
# lodos - rather old/small
- ('kvm64-4', 1), # 2 cores, 4Gb
-# cyblok
('kvm64-5', 1), # 2 cores, 4Gb
('kvm64-5', 1), # 2 cores, 4Gb
-#
we also have speedball installed but it is reserved for manual trials of libvirt/qemu
-
# ('kvm64-6', 3), # 4
cores, 4Gb
+#
cyblok
+
('kvm64-6', 1), # 2
cores, 4Gb
]
# the nodes pool has a MAC address as user-data (3rd elt in tuple)
]
# the nodes pool has a MAC address as user-data (3rd elt in tuple)