Changes for result publication in ERP5.

slapos/recipe/nosqltestbed/__init__.py

@@ -56,8 +56,10 @@ class NoSQLTestBed(BaseSlapRecipe):
     
     kumo_cloud_config.setdefault('nb_server_max', 4) # 3
     kumo_cloud_config.setdefault('nb_tester_max', 5) # 3
-    kumo_cloud_config.setdefault('nb_thread', 32) # 1
-    kumo_cloud_config.setdefault('nb_request', 1024000) # 1000
+    kumo_cloud_config.setdefault('nb_thread', 32)
+    kumo_cloud_config.setdefault('nb_request', 1024000)
+    kumo_cloud_config.setdefault('erp5_publish_url', '')
+    kumo_cloud_config.setdefault('erp5_publish_project', '')
     
     computer_guid_list  = "COMP-23:" # manager
     computer_guid_list += "COMP-13:" # server 1

slapos/recipe/nosqltestbed/template/kumotester_manager_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(nosqltester_manager_binary)s %(plugin_name)s -a %(address)s -r %(report_path)s -s %(nb_server_max)s -t %(nb_tester_max)s %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s %(nb_thread)s %(nb_request)s
+exec %(nosqltester_manager_binary)s %(plugin_name)s -a %(address)s \
+  -r %(report_path)s -s %(max_server)s -t %(max_tester)s \
+  --erp5-publish-url "%(erp5_publish_url)s" --erp5-publish-project "%(erp5_publish_project)s" \
+  %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s \
+  %(nb_thread)s %(nb_request)s

slapos/recipe/nosqltestbed/template/nosqltester_manager_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(nosqltester_manager_binary)s %(plugin_name)s -a %(address)s -r %(report_path)s -s %(nb_server_max)s -t %(nb_tester_max)s %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s
+exec %(nosqltester_manager_binary)s %(plugin_name)s -a %(address)s \
+  -r %(report_path)s -s %(max_server)s -t %(max_tester)s \
+  --erp5-publish-url "%(erp5_publish_url)s" --erp5-publish-project "%(erp5_publish_project)s" \
+  %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s

software/nosqltestbed/software.cfg

@@ -56,6 +56,7 @@ eggs =
   slapos.tool.nosqltester
   slapos.tool.nosqltester_manager
   slapos.tool.nosqltester_manager.kumo
+  erp5.utils.benchmark
 
 [template]
 recipe = slapos.recipe.template