Commit affd4fe9 authored by Benjamin Blanc's avatar Benjamin Blanc

scalability: stack/erp5 Rename section and binary

parent 7d0f9b78
...@@ -3,13 +3,15 @@ ...@@ -3,13 +3,15 @@
develop = develop =
${:parts-directory}/slapos.cookbook-repository ${:parts-directory}/slapos.cookbook-repository
${:parts-directory}/cloudooo-repository ${:parts-directory}/cloudooo-repository
${:parts-directory}/erp5.util # not really just erp5-util but all erp5
${:parts-directory}/erp5.dev-repository
extensions = extensions =
slapos.zcbworkarounds slapos.zcbworkarounds
mr.developer mr.developer
find-links = find-links =
http://192.168.242.75:1235/
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/ http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
http://dist.repoze.org http://dist.repoze.org
...@@ -103,6 +105,7 @@ parts = ...@@ -103,6 +105,7 @@ parts =
eggs eggs
testrunner testrunner
test_suite_runner test_suite_runner
scalability_test_suite_runner
# basic Xorg # basic Xorg
libXdmcp libXdmcp
...@@ -137,11 +140,11 @@ parts = ...@@ -137,11 +140,11 @@ parts =
slapos.recipe.template slapos.recipe.template
# Create instance template # Create instance template
template template
erp5.util-repository erp5.dev-repository
erp5.util-check
erp5.util erp5.util
erp5.util-check
[erp5.util-repository] [erp5.dev-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://192.168.242.75:1235/erp5.git repository = http://192.168.242.75:1235/erp5.git
branch = scalability-master2 branch = scalability-master2
...@@ -157,7 +160,7 @@ command = grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link ...@@ -157,7 +160,7 @@ command = grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = erp5.util eggs = erp5.util
scripts = scripts =
ugly-depend-on = ${erp5.util-repository:repository} ${erp5.util-repository:branch} ugly-depend-on = ${erp5.dev-repository:repository} ${erp5.dev-repository:branch}
[download-base] [download-base]
...@@ -320,7 +323,7 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc ...@@ -320,7 +323,7 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc
[template-scalability] [template-scalability]
< = download-base < = download-base
filename = instance-scalability.cfg.in filename = instance-scalability.cfg.in
md5sum = 8aba8111a23eec924ec02b743a729463 md5sum = fb479b5d2732fa32795be3ecb2ab22c9
[template-zeo] [template-zeo]
< = download-base < = download-base
...@@ -446,12 +449,14 @@ initialization = ...@@ -446,12 +449,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]
# TODO : make also a binary for performance_tester
# Test to make binary # Test to make binary
[scalability_launcher] [scalability_test_suite_runner]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = ${eggs:eggs} eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths} extra-paths = ${eggs:extra-paths}
scripts = erp5.util.scalability.scalability_launcher:main scripts = erp5.util.scalability.runScalabilityTestSuite:main
[eggs] [eggs]
......
...@@ -32,14 +32,17 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} ...@@ -32,14 +32,17 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
# Create binary # Create binary
[launcher] [launcher]
scripts = scripts =
runScalabilityTestSuite = erp5.util.scalability.scalability_launcher:main runScalabilityTestSuite = erp5.util.scalability.runScalabilityTestSuite:main
log-path = ${basedirectory:log}/runScalabilityTestSuite.log log-path = ${basedirectory:log}/runScalabilityTestSuite.log
binary-path = ${:bin-directory}/runScalabilityTestSuite binary-path = ${:bin-directory}/runScalabilityTestSuite
# TODO : make also a wrapper for performance_tester (used by runScalabilityTestSuite)
# Create wrapper and execute command with parameters # Create wrapper and execute command with parameters
[binary-wrap-launcher] [binary-wrap-launcher]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${rootdirectory:bin}/launcher wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
output = ${launcher:binary-path} output = ${launcher:binary-path}
# TODO : get the erp5-cluster main url (apache listening user port ?) # TODO : get the erp5-cluster main url (apache listening user port ?)
erp5-url = http://foo.bar erp5-url = http://foo.bar
......
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