Commit a0ef755f authored by Boxiang Sun's avatar Boxiang Sun

slapos-master: erp5testnode: Update test_runner_external_port

parent 7207a0ab
...@@ -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 = da8399562377b472c9488a337d0230dc md5sum = d42b61b2d08305297cfc3550924767a4
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
......
...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment