kvm: resiliency test: add wrapper for erp5testnode.

software/kvm/common.cfg

@@ -48,6 +48,7 @@ eggs =
   slapos.toolbox
   erp5.util
   cns.recipe.symlink
+  collective.recipe.template
 
 [http-proxy]
 # https://github.com/nodejitsu/node-http-proxy
@@ -107,7 +108,7 @@ on-update = true
 [template-kvm-resilient-test]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
-md5sum = 080b5790b95a979e44c4a8e26dc02835
+#md5sum = 8b6bd057721a8e4d84c5cd62a97cffe6
 mode = 0644
 download-only = true
 on-update = true

software/kvm/instance-kvm-resilient-test.cfg.jinja2

@@ -5,7 +5,8 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 parts =
-  deploy-resiliency-test
+  deploy-unit-test
+  deploy-scalability-test
   request-resilient-kvm
   deploy-standalone-resiliency-test
 
@@ -21,20 +22,30 @@ log = ${:var}/log/
 services = ${:etc}/service/
 scripts = ${:etc}/run/
 
-[deploy-resiliency-test]
+[deploy-scalability-test]
 recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:scripts}/runKVMResiliencyTestSuite
+# XXX: put it in etc/run in case of scalability test so that it runs automatically.
+wrapper-path = ${directory:bin}/runKVMResiliencyTestSuite
 testnode-parameters = --test-result-path={{ slapparameter_dict.get('test-result-path') }} --revision={{ slapparameter_dict.get('test-suite-revision') }} --node-title={{ slapparameter_dict.get('scalability-launcher-title') }} --test-suite={{ slapparameter_dict.get('test-suite') }} --test-suite-master-url={{ slapparameter_dict.get('test-suite-master-url') }} --log-path=${directory:log}
 kvm-test-parameters = server_url=${slap-connection:server-url} key_file=${slap-connection:key-file} cert_file=${slap-connection:cert-file} computer_id=${slap-connection:computer-id} partition_id=${slap-connection:partition-id} software=${slap-connection:software-release-url} namebase=kvm kvm_rootinstance_name='${request-resilient-kvm:name}'
+command-line = {{ bin_directory }}/runResiliencyScalabilityTestNode ${:testnode-parameters} ${:kvm-test-parameters}
 
-command-line = {{ bin_directory }}/runResiliencyTest ${:testnode-parameters} ${:kvm-test-parameters}
-
+[deploy-unit-test]
+recipe = collective.recipe.template
+#testnode-parameters = --test-result-path={{ slapparameter_dict.get('test-result-path') }} --revision={{ slapparameter_dict.get('test-suite-revision') }} --node-title={{ slapparameter_dict.get('scalability-launcher-title') }} --test-suite={{ slapparameter_dict.get('test-suite') }} --test-suite-master-url={{ slapparameter_dict.get('test-suite-master-url') }} --log-path=${directory:log}
+kvm-test-parameters = server_url=${slap-connection:server-url} key_file=${slap-connection:key-file} cert_file=${slap-connection:cert-file} computer_id=${slap-connection:computer-id} partition_id=${slap-connection:partition-id} software=${slap-connection:software-release-url} namebase=kvm kvm_rootinstance_name='${request-resilient-kvm:name}'
+input = inline:
+  #!/bin/sh
+  exec {{ bin_directory }}/runResiliencyUnitTestTestNode $@ ${:kvm-test-parameters}
+output = ${directory:bin}/runTestSuite
+mode = 755
 
 [deploy-standalone-resiliency-test]
 # Used to manually run the KVM test if we don't have a running testnode.
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/runStandaloneResiliencyTestSuite
-command-line = {{ bin_directory }}/runStandaloneResiliencyTest --test-suite-title=kvm ${deploy-resiliency-test:kvm-test-parameters}
+command-line = {{ bin_directory }}/runStandaloneResiliencyTest --test-suite-title=kvm ${:kvm-test-parameters}
+kvm-test-parameters = server_url=${slap-connection:server-url} key_file=${slap-connection:key-file} cert_file=${slap-connection:cert-file} computer_id=${slap-connection:computer-id} partition_id=${slap-connection:partition-id} software=${slap-connection:software-release-url} namebase=kvm kvm_rootinstance_name='${request-resilient-kvm:name}'
 
 [request-resilient-kvm]
 <= slap-connection

software/kvm/software-for-erp5testnode.cfg

 [buildout]
-extends = common.cfg
+extends = development.cfg
 
 # Change default software-type to be "test", so that it can be run using erp5testnode.
 [template]