Commit ae2b9fdf authored by Benjamin Blanc's avatar Benjamin Blanc

stack/erp5: scalability add wrapper to runScalabilityTestSuite

parent 4ef9fe3c
...@@ -28,6 +28,8 @@ repository = ${erp5-util-repository:location} ...@@ -28,6 +28,8 @@ repository = ${erp5-util-repository:location}
recipe = slapos.cookbook:egg_test recipe = slapos.cookbook:egg_test
run-test-suite = $${create-directory:bin}/runTestSuite run-test-suite = $${create-directory:bin}/runTestSuite
run-test-suite-binary = ${buildout:bin-directory}/runTestSuite run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
run-scalability-test-suite = $${create-directory:bin}/runScalabilityTestSuite
run-scalability-test-suite-binary = $${buildout:bin-directory}/runScalabilityTestSuite
# The list of executables should be defined here and a combination # The list of executables should be defined here and a combination
# of tests should dynamically generated. # of tests should dynamically generated.
#python-list = $${} #python-list = $${}
......
...@@ -297,7 +297,7 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc ...@@ -297,7 +297,7 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc
[template-scalability] [template-scalability]
< = download-base < = download-base
filename = instance-scalability.cfg.in filename = instance-scalability.cfg.in
md5sum = fbbfece0272b819cda88895b6cb7258a md5sum = cd0f1a92a3aba62ddae4dd52a0a4dc28
[template-zeo] [template-zeo]
< = download-base < = download-base
...@@ -423,6 +423,14 @@ initialization = ...@@ -423,6 +423,14 @@ initialization =
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split())) repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list] sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
# Test to make binary
[scalability_launcher]
recipe = zc.recipe.egg
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
scripts = erp5.util.scalability.scalability_launcher:main
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
parts = parts =
erp5-cluster erp5-cluster
launcher launcher
# binary-wrap-launcher binary-wrap-launcher
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
...@@ -26,34 +27,32 @@ config = ...@@ -26,34 +27,32 @@ 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)) }}
[launcher-param]
binary-path = ${rootdirectory:bin}/launcher
wrapper-path = ${rootdirectory:bin}/launcher
log-path = ${basedirectory:log}/launcher.log
test-suite-title = {{ slapparameter_dict.get('test-suite-title', '') }}
# Create bin
[launcher] [launcher]
erp5.util.benchmark.scalability_launcher:main scripts =
runScalabilityTestSuite = erp5.util.scalability.scalability_launcher:main
log-path = ${basedirectory:log}/runScalabilityTestSuite.log
binary-path = ${:bin-directory}/runScalabilityTestSuite
# Create wrapper and execute command with parameters
[binary-wrap-launcher]
recipe = slapos.cookbook:wrapper
wrapper-path = ${rootdirectory:bin}/launcher
output = ${launcher:binary-path}
command-line = "${binary-wrap-launcher:wrapper-path} --log ${launcher:log-path} --help"
return = url
#[binary-wrap-launcher]
#recipe = slapos.cookbook:wrapper
#command-line = "${launcher-param:binary-path} --test_suite_title ${launcher-param:test-suite-title} --log ${launcher-param:log-path}"
#output = ${launcher-param:binary-path}
#return = url
[basedirectory] [basedirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
log = ${rootdirectory:var}/log log = ${rootdirectory:var}/log
run = ${rootdirectory:var}/run
services = ${rootdirectory:etc}/run
[rootdirectory] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
var = ${buildout:directory}/var var = ${buildout:directory}/var
srv = ${buildout:directory}/srv
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
{% endif %} {% endif %}
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