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
put gotan back to business
[tests.git]
/
system
/
LocalSubstrate.inria.py
diff --git
a/system/LocalSubstrate.inria.py
b/system/LocalSubstrate.inria.py
index
f0712ce
..
2d0123b
100755
(executable)
--- a/
system/LocalSubstrate.inria.py
+++ b/
system/LocalSubstrate.inria.py
@@
-19,19
+19,22
@@
class OnelabSubstrate (Substrate):
return 'testmaster'
# the build boxes we use
return 'testmaster'
# the build boxes we use
- def build_boxes_spec (self):
+ def build_
vs_
boxes_spec (self):
return [ 'liquid', 'reed', 'velvet' ]
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):
# 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 [
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
return [
-
# ('gotan', 3
0), # how many plcs max in this box
- ('deathvegas',
3
0),
+
('gotan', 1
0), # how many plcs max in this box
+ ('deathvegas',
1
0),
]
# vplc01 to 40
]
# vplc01 to 40
@@
-44,7
+47,9
@@
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
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 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-4', 2), # 4 cores, 8Gb
('kvm64-3', 1), # 2 cores, 4Gb
('kvm64-2', 3), # 4 cores, 4Gb
('kvm64-4', 2), # 4 cores, 8Gb
('kvm64-3', 1), # 2 cores, 4Gb