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
remove gotan from test infra cause tests are passing yet on it
[tests.git]
/
system
/
LocalSubstrate.inria.py
diff --git
a/system/LocalSubstrate.inria.py
b/system/LocalSubstrate.inria.py
index
f512440
..
6008649
100755
(executable)
--- a/
system/LocalSubstrate.inria.py
+++ b/
system/LocalSubstrate.inria.py
@@
-19,18
+19,23
@@
class OnelabSubstrate (Substrate):
return 'testmaster'
# the build boxes we use
return 'testmaster'
# the build boxes we use
- def build_boxes_spec (self):
- return [ 'liquid', 'reed', 'velvet', 'gorillaz', ]
+ 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):
# the vs-capable box for PLCs
def plc_vs_boxes_spec (self):
- return [ ('vs64-1', 35), # how many plcs max in this box
- ]
+ return [ ]
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
- return [ ('lxc64-1', 35), # how many plcs max in this box
- ]
+ return [
+# ('gotan', 10), # how many plcs max in this box
+ ('deathvegas', 10),
+ ]
# vplc01 to 40
def vplc_ips (self):
# vplc01 to 40
def vplc_ips (self):
@@
-40,12
+45,13
@@
class OnelabSubstrate (Substrate):
def qemu_boxes_spec (self):
return [ # how many qemus max in this box
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-2', 3), # 4 cores, 4Gb
- ('kvm64-
3', 2), # 2 cores, 4
Gb
- ('kvm64-
4', 1), # 4 cores, 8
Gb
+ ('kvm64-
4', 2), # 4 cores, 8
Gb
+ ('kvm64-
3', 1), # 2 cores, 4
Gb
('kvm64-5', 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)
]
# the nodes pool has a MAC address as user-data (3rd elt in tuple)