stack/erp5: scalability add wrapper to runScalabilityTestSuite

software/erp5-util-testing/instance.cfg

@@ -28,6 +28,8 @@ repository = ${erp5-util-repository:location}
 recipe = slapos.cookbook:egg_test
 run-test-suite = $${create-directory:bin}/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
 # of tests should dynamically generated.
 #python-list = $${}

stack/erp5/buildout.cfg

@@ -287,7 +287,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f
 [template-scalability]
 < = download-base
 filename = instance-scalability.cfg.in
-md5sum = fbbfece0272b819cda88895b6cb7258a
+md5sum = cd0f1a92a3aba62ddae4dd52a0a4dc28
 
 [template-zeo]
 < = download-base
@@ -415,6 +415,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]
 
+# 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]
 recipe = zc.recipe.egg
 python = python2.7

stack/erp5/instance-scalability.cfg.in

@@ -3,7 +3,8 @@
 parts =
   erp5-cluster
   launcher
-#  binary-wrap-launcher
+  binary-wrap-launcher
+  
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
@@ -26,34 +27,32 @@ config =
 extra-config =
 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]
-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]
 recipe = slapos.cookbook:mkdirectory
 log = ${rootdirectory:var}/log
-run = ${rootdirectory:var}/run
-services = ${rootdirectory:etc}/run
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
 var = ${buildout:directory}/var
-srv = ${buildout:directory}/srv
 bin = ${buildout:directory}/bin
 
 {% endif %}