scalability: stack/erp5 Add scalability recipe

setup.py

@@ -108,6 +108,7 @@ setup(name=name,
           'erp5.update = slapos.recipe.erp5_update:Recipe',
           'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
+          'scalability = slapos.recipe.scalability:Recipe',
           'firefox = slapos.recipe.firefox:Recipe',
           'fontconfig = slapos.recipe.fontconfig:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',

stack/erp5/buildout.cfg

@@ -179,7 +179,8 @@ mode = 644
 # Local development
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.git
+#repository = http://git.erp5.org/repos/slapos.git
+repository = http://192.168.242.75:1236/slapos.git
 branch = erp5-cluster-z2.13-scalability
 git-executable = ${git:location}/bin/git
 
@@ -321,7 +322,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f
 [template-scalability]
 < = download-base
 filename = instance-scalability.cfg.in
-md5sum = 82f88b1d2e858cce2595c9db34cfa8dc
+md5sum = f32985483f089549a3bfe1a95ab099c3
 
 [template-zeo]
 < = download-base

stack/erp5/instance-scalability.cfg.in

@@ -3,6 +3,7 @@
 parts =
   erp5-cluster
   binary-wrap-launcher
+  scalability-launcher-instance
   
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
@@ -38,14 +39,27 @@ output = ${binary-wrap-launcher:binary-path}
 erp5-url = http://foo.bar
 # Run scalability test suite wrapper command with parameters
 # -\ dirty way to conserve spaces
-command-line = "${binary-wrap-launcher:binary-path}" --erp5-url ${binary-wrap-launcher:erp5-url} --test-result-path {{ slapparameter_dict.get('test-result-path') }} --revision {{ slapparameter_dict.get('revision') }} --node-title {{ slapparameter_dict.get('node-title') }} --test-suite-master-url {{ slapparameter_dict.get('test-suite-master-url') }} --log-path ${binary-wrap-launcher:log-path}
+# command-line = "${binary-wrap-launcher:binary-path}" --erp5-url ${binary-wrap-launcher:erp5-url} --test-result-path {{ slapparameter_dict.get('test-result-path') }} --revision {{ slapparameter_dict.get('revision') }} --node-title {{ slapparameter_dict.get('node-title') }} --test-suite-master-url {{ slapparameter_dict.get('test-suite-master-url') }} --log-path ${binary-wrap-launcher:log-path}
+command-line = ${binary-wrap-launcher:binary-path}
 return = url
 
 
+[scalability-launcher-instance]
+recipe = slapos.cookbook:scalability
+configuration-file = ${rootdirectory:etc}/scalability_runner.conf
+wrapper = ${basedirectory:services}/scalability_runner
+erp5-url = ${binary-wrap-launcher:erp5-url}
+test-result-path = {{ slapparameter_dict.get('test-result-path') }}
+revision = {{ slapparameter_dict.get('revision') }}
+node-title = {{ slapparameter_dict.get('node-title') }}
+test-suite-master-url = {{ slapparameter_dict.get('test-suite-master-url') }}
+log-path = ${binary-wrap-launcher:log-path}
+
 # Create partition's directories
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
 log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory