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