Commit 43c976c7 authored by Benjamin Blanc's avatar Benjamin Blanc

scalability: add to launcher zope-user family entry url as erp5-url

parent ed684dce
...@@ -329,7 +329,7 @@ md5sum = c745d794b28cae64feba527f894d7340 ...@@ -329,7 +329,7 @@ md5sum = c745d794b28cae64feba527f894d7340
[template-scalability] [template-scalability]
< = download-base < = download-base
filename = instance-scalability.cfg.in filename = instance-scalability.cfg.in
md5sum = 02431bfd564f0d45a87f11f8dc97072c md5sum = cd676f9ad7c9cbb63a71404b699feb38
[template-zeo] [template-zeo]
< = download-base < = download-base
......
...@@ -39,7 +39,7 @@ config = {{ cluster_parameter_dict.keys() | join(' ') }} ...@@ -39,7 +39,7 @@ config = {{ cluster_parameter_dict.keys() | join(' ') }}
{% for key, value in cluster_parameter_dict.items() -%} {% for key, value in cluster_parameter_dict.items() -%}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor -%}
return = mariadb-url family-scalability memcached-persistent-url memcached-volatile-url cloudooo-url return = mariadb-url family-scalability family-user memcached-persistent-url memcached-volatile-url cloudooo-url
# Create wrapper # Create wrapper
[binary-wrap-launcher] [binary-wrap-launcher]
...@@ -48,11 +48,9 @@ log-path = ${basedirectory:log}/runScalabilityTestSuite.log ...@@ -48,11 +48,9 @@ log-path = ${basedirectory:log}/runScalabilityTestSuite.log
binary-path = {{ bin_directory }}/runScalabilityTestSuite binary-path = {{ bin_directory }}/runScalabilityTestSuite
wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
output = ${binary-wrap-launcher:binary-path} output = ${binary-wrap-launcher:binary-path}
# TODO : get the erp5-cluster main url (apache listening user port ?) site-id = "/{{ site_id }}"
erp5-url = http://foo.bar # Suppose that there is a user zope family in the configuration
# Run scalability test suite wrapper command with parameters erp5-url = ${erp5-cluster:connection-family-user}${:site-id}
# -\ dirty way to conserve spaces
# command-line = "${binary-wrap-launcher:binary-path}" --erp5-url ${binary-wrap-launcher:erp5-url} --test-result-path {{ slapparameter_dict.get('test-result-path') }} --revision {{ slapparameter_dict.get('revision') }} --node-title {{ slapparameter_dict.get('node-title') }} --test-suite-master-url {{ slapparameter_dict.get('test-suite-master-url') }} --log-path ${binary-wrap-launcher:log-path}
parameters-extra = $* parameters-extra = $*
command-line = ${binary-wrap-launcher:binary-path} command-line = ${binary-wrap-launcher:binary-path}
return = url return = url
......
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