Commit c9a084e4 authored by Benjamin Blanc's avatar Benjamin Blanc

scalability: fix md5sum

Scalability: test

scalability: fix md5

scalability: Fix command-line launcher binary path

scalability: fix testsuite name

scalability: test
parent 58dc30bf
...@@ -208,7 +208,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 ...@@ -208,7 +208,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 55a4a8957ac0cb9462fadafe9a2fe378 md5sum = 36ba0ca411fac348faa95ac7c0892e96
extra-context = extra-context =
key apache_location apache:location key apache_location apache:location
key aspell_location aspell:location key aspell_location aspell:location
...@@ -287,7 +287,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f ...@@ -287,7 +287,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f
[template-scalability] [template-scalability]
< = download-base < = download-base
filename = instance-scalability.cfg.in filename = instance-scalability.cfg.in
md5sum = 6d33726c7cbe727fe7175080864e3ea1 md5sum = fbbfece0272b819cda88895b6cb7258a
[template-zeo] [template-zeo]
< = download-base < = download-base
......
...@@ -24,24 +24,18 @@ config = ...@@ -24,24 +24,18 @@ config =
${:extra-config} ${:extra-config}
extra-config = extra-config =
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
return = url
[launcher-param] [launcher-param]
binary-path = ${rootdirectory:bin}/launcher binary-path = ${rootdirectory:bin}/launcher
wrapper-path = ${rootdirectory:bin}/launcher wrapper-path = ${rootdirectory:bin}/launcher
log-path = ${basedirectory:log}/scalability_launcher.log log-path = ${basedirectory:log}/launcher.log
test-suite-title = {{ slapparameter_dict.get('test-suite-title', '') }} test-suite-title = {{ slapparameter_dict.get('test-suite-title', '') }}
[binary-wrap-launcher] [binary-wrap-launcher]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = "{{ parameter_dict['launcher-location'] }}/bin/launcher \ command-line = "${launcher-param:binary-path} --test_suite_title ${launcher-param:test-suite-title} --log ${launcher-param:log-path}"
--test_suite_title Bonjour --log ${launcher-param:log-path}"
output = ${launcher-param:binary-path} output = ${launcher-param:binary-path}
return = url
#
# voir : instance-mariadb.cfg.in ... (ou pas)
#
[basedirectory] [basedirectory]
......
...@@ -169,6 +169,7 @@ template = {{ template_scalability }} ...@@ -169,6 +169,7 @@ template = {{ template_scalability }}
filename = instance-scalability.cfg filename = instance-scalability.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
# Must match the key id in [switch-softwaretype] which uses this section. # Must match the key id in [switch-softwaretype] which uses this section.
raw software_type scalability raw software_type scalability
......
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