Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos
Commits
bf982827
Commit
bf982827
authored
Jul 07, 2023
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/erp5testnode: Use slap-connection shared-parts
parent
a07fa66b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
software/erp5testnode/buildout.hash.cfg
software/erp5testnode/buildout.hash.cfg
+2
-2
software/erp5testnode/instance-default.cfg.jinja.in
software/erp5testnode/instance-default.cfg.jinja.in
+7
-1
software/erp5testnode/instance.cfg
software/erp5testnode/instance.cfg
+1
-0
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
software/erp5testnode/buildout.hash.cfg
View file @
bf982827
...
...
@@ -14,8 +14,8 @@
# not need these here).
[template]
filename = instance.cfg
md5sum =
a0e249bc3e0af5c23c85c3b31314be5f
md5sum =
9b33c3fc56e6ed68c9dc7f1d5530f67e
[template-default]
filename = instance-default.cfg.jinja.in
md5sum =
96fb2221c8a91fb44dc5b931c29e0af
9
md5sum =
3959e9e5e7c9f05cb341520a34ba06c
9
software/erp5testnode/instance-default.cfg.jinja.in
View file @
bf982827
...
...
@@ -37,7 +37,13 @@ recipe = slapos.cookbook:erp5testnode
slapos-directory = $${directory:slapos}
working-directory = $${directory:testnode}
test-suite-directory = $${directory:test-suite}
shared-part-list = $${directory:shared}
shared-part-list =
{%- if 'shared-part-list' in slap_connection %}
{{ slap_connection['shared-part-list'] | indent(2) }}
{%- else %}
{{ """${buildout:shared-part-list}""" | indent(2) }}
{%- endif %}
$${directory:shared}
proxy-host = {{ partition_ipv4 }}
proxy-port = 5000
log-directory = $${directory:log}
...
...
software/erp5testnode/instance.cfg
View file @
bf982827
...
...
@@ -26,6 +26,7 @@ output = $${buildout:directory}/instance-default.cfg
context =
import json json
jsonkey default_parameter_dict :default-parameters
section slap_connection slap-connection
key slapparameter_dict slap-configuration:configuration
key partition_ipv6 slap-configuration:ipv6-random
key partition_ipv4 slap-configuration:ipv4-random
...
...
stack/slapos.cfg
View file @
bf982827
...
...
@@ -296,7 +296,7 @@ sgmllib3k = 1.0.0
simplegeneric = 0.8.1
singledispatch = 3.4.0.3
six = 1.16.0
slapos.cookbook = 1.0.32
6
slapos.cookbook = 1.0.32
9
slapos.core = 1.10.1
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25
...
...
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