Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lukas Niegsch
erp5
Commits
fb31fb52
Commit
fb31fb52
authored
Jun 07, 2021
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: Shorten instance partition paths
`inst/test0-0` -> `i/0` See merge request
!1441
parent
3db46412
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
erp5/util/testnode/SlapOSControler.py
erp5/util/testnode/SlapOSControler.py
+2
-2
erp5/util/testnode/__init__.py
erp5/util/testnode/__init__.py
+1
-1
No files found.
erp5/util/testnode/SlapOSControler.py
View file @
fb31fb52
...
...
@@ -53,7 +53,7 @@ class SlapOSControler(object):
createFolder
(
shared
)
self
.
shared_part_list
=
self
.
shared_part_list
+
[
shared
]
self
.
instance_root
=
os
.
path
.
join
(
working_directory
,
'i
nst
'
)
self
.
instance_root
=
os
.
path
.
join
(
working_directory
,
'i'
)
self
.
slapos_config
=
os
.
path
.
join
(
working_directory
,
'slapos.cfg'
)
self
.
proxy_database
=
os
.
path
.
join
(
working_directory
,
'proxy.db'
)
self
.
instance_config
=
{}
...
...
@@ -287,7 +287,7 @@ class SlapOSControler(object):
# create partition and configure computer
# XXX: at the moment all partitions do share same virtual interface address
# this is not a problem as usually all services are on different ports
partition_reference
=
'%s
-
%s'
%
(
config
[
'partition_reference'
],
i
)
partition_reference
=
'%s%s'
%
(
config
[
'partition_reference'
],
i
)
partition_path
=
os
.
path
.
join
(
instance_root
,
partition_reference
)
if
not
(
os
.
path
.
exists
(
partition_path
)):
os
.
mkdir
(
partition_path
)
...
...
erp5/util/testnode/__init__.py
View file @
fb31fb52
...
...
@@ -62,7 +62,7 @@ def main(*args):
logger
.
disable
(
logging
.
CRITICAL
)
CONFIG
=
{
'partition_reference'
:
'
test0
'
,
'partition_reference'
:
''
,
}
config
=
configparser
.
SafeConfigParser
()
# do not change case of option keys
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment