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
Boxiang Sun
slapos
Commits
a0ef755f
Commit
a0ef755f
authored
Apr 13, 2023
by
Boxiang Sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-master: erp5testnode: Update test_runner_external_port
parent
7207a0ab
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
software/slapos-master/buildout.hash.cfg
software/slapos-master/buildout.hash.cfg
+1
-1
software/slapos-master/instance-balancer.cfg.in
software/slapos-master/instance-balancer.cfg.in
+7
-1
No files found.
software/slapos-master/buildout.hash.cfg
View file @
a0ef755f
...
@@ -18,7 +18,7 @@ md5sum = 2491969d49f8bf9b172e89b1c0e9d98e
...
@@ -18,7 +18,7 @@ md5sum = 2491969d49f8bf9b172e89b1c0e9d98e
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum = d
a8399562377b472c9488a337d0230dc
md5sum = d
42b61b2d08305297cfc3550924767a4
[template-apache-backend-conf]
[template-apache-backend-conf]
filename = apache-backend.conf.in
filename = apache-backend.conf.in
...
...
software/slapos-master/instance-balancer.cfg.in
View file @
a0ef755f
...
@@ -15,6 +15,12 @@ per partition. No more (undefined result), no less (IndexError).
...
@@ -15,6 +15,12 @@ per partition. No more (undefined result), no less (IndexError).
{% do apache_ip_list.append('[' ~ ipv6 ~ ']') -%}
{% do apache_ip_list.append('[' ~ ipv6 ~ ']') -%}
{% endif -%}
{% endif -%}
[tcp-port]
recipe = slapos.cookbook:free_port
minimum = {{ slapparameter_dict['tcpv4-port'] }}
maximum = {{ slapparameter_dict['tcpv4-port']}} + 100
ip = ipv6
[jinja2-template-base]
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -60,7 +66,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -60,7 +66,7 @@ recipe = slapos.recipe.template:jinja2
{% if test_runner_address_list -%}
{% if test_runner_address_list -%}
{% set test_runner_backend_mapping = {} %}
{% set test_runner_backend_mapping = {} %}
{% set test_runner_balancer_url_list = [] %}
{% set test_runner_balancer_url_list = [] %}
{% set test_runner_external_port =
next_port()
%}
{% set test_runner_external_port =
${tcp-port:port}
%}
{% for i, (test_runner_internal_ip, test_runner_internal_port) in enumerate(test_runner_address_list) %}
{% for i, (test_runner_internal_ip, test_runner_internal_port) in enumerate(test_runner_address_list) %}
{% do test_runner_backend_mapping.__setitem__(
{% do test_runner_backend_mapping.__setitem__(
'unit_test_' ~ i,
'unit_test_' ~ i,
...
...
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