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
run lxc-enter-namespace with --noseclabel
[tests.git]
/
system
/
LocalSubstrate.inria.py
diff --git
a/system/LocalSubstrate.inria.py
b/system/LocalSubstrate.inria.py
index
766f062
..
2562d67
100755
(executable)
--- a/
system/LocalSubstrate.inria.py
+++ b/
system/LocalSubstrate.inria.py
@@
-1,6
+1,7
@@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
+# -*- python3 -*-
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 201
0
INRIA
+# Copyright (C) 201
5
INRIA
#
# this is only an example file
# the actual file is installed in your testmaster box as /root/LocalTestResources.py
#
# this is only an example file
# the actual file is installed in your testmaster box as /root/LocalTestResources.py
@@
-20,7
+21,8
@@
class OnelabSubstrate (Substrate):
# the experimental lxc-based build box
def build_lxc_boxes_spec (self):
# the experimental lxc-based build box
def build_lxc_boxes_spec (self):
- return [ 'liquid', 'reed', 'velvet' ]
+# liquid only used for the last f18 build
+ return [ 'buzzcocks', 'liquid' ]
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
# the lxc-capable box for PLCs
def plc_lxc_boxes_spec (self):
@@
-32,34
+34,38
@@
class OnelabSubstrate (Substrate):
# vplc01 to 40
def vplc_ips (self):
# vplc01 to 40
def vplc_ips (self):
- return [ ( 'vplc
%02d'%i,
# DNS name
+ return [ ( 'vplc
{:02d}'.format(i),
# DNS name
'unused') # MAC address
for i in range(1,41) ]
'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 [ # (hostname, how many qemus max in this box)
def qemu_boxes_spec (self):
return [ # (hostname, how many qemus max in this box)
+ ('boxtops', 12),
+ ]
+
+# these boxes are going on a well deserved retirement
+# as of jan 2014 this is renumbered so that 1 is preferred
# speedball (1) - old school but robust and a big disk
# speedball (1) - old school but robust and a big disk
- ('speedball', 2), # 4 cores, 4Gb, 840 Gb
+
#
('speedball', 2), # 4 cores, 4Gb, 840 Gb
# used to have kruder too, but it is broken/dead
# dorfmeister (2)
# used to have kruder too, but it is broken/dead
# dorfmeister (2)
- ('dorfmeister', 2), # 4 cores, 4Gb
+
#
('dorfmeister', 2), # 4 cores, 4Gb
# enfoui - L119 as it won't work well under the KVM in L102A
# use F10 to enter BIOS setup
# nodes spawned in this box won't get network connectivity
# enfoui - L119 as it won't work well under the KVM in L102A
# use F10 to enter BIOS setup
# nodes spawned in this box won't get network connectivity
- ('enfoui', 4), # 4 cores, 8Gb
+
#
('enfoui', 4), # 4 cores, 8Gb
# estran (4) - big mem but small disk
# estran (4) - big mem but small disk
- ('estran', 3), # 4 cores, 8Gb
+# take it out because it takes much of the load and then gets full..
+# ('estran', 2), # 4 cores, 8Gb
# lodos (5) - rather old/small
# lodos (5) - rather old/small
- ('lodos', 1), # 2 cores, 4Gb
+
#
('lodos', 1), # 2 cores, 4Gb
# cyblok (6)
# cyblok (6)
- ('cyblok', 1), # 2 cores, 4Gb
- ]
+# ('cyblok', 1), # 2 cores, 4Gb
# the nodes pool has a MAC address as user-data (3rd elt in tuple)
def vnode_ips (self):
# the nodes pool has a MAC address as user-data (3rd elt in tuple)
def vnode_ips (self):
- return [ ( 'vnode
%02d'%i,
# DNS name
- '02:34:56:00:00:
%02d'%i)
# MAC address
+ return [ ( 'vnode
{:02d}'.format(i),
# DNS name
+ '02:34:56:00:00:
{:02d}'.format(i))
# MAC address
for i in range(1,21) ]
# local network settings
for i in range(1,21) ]
# local network settings