Slaprunner SR: add resiliency test.

software/slaprunner/common.cfg

@@ -73,7 +73,7 @@ command =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
-md5sum = b6ed8c30cc2ec51244796ce57315089f
+md5sum = 92a2f3bcd5ff79e3b61ca4a8bacb73ec
 mode = 0644
 
 [template-runner]
@@ -104,6 +104,13 @@ md5sum = fc253453da66583e7d515a6e2eb1475e
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 
+[template-resilient-test]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
+#md5sum = fc253453da66583e7d515a6e2eb1475e
+filename = instance-resilient-test.cfg.jinja2
+mode = 0644
+
 [template_nginx_conf]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/nginx_conf.in

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

+[buildout]
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+parts =
+  deploy-resiliency-test
+  request-resilient-instance
+  deploy-standalone-resiliency-test
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = ${buildout:directory}
+etc = ${:home}/etc/
+var = ${:home}/var/
+srv = ${:home}/srv/
+bin = ${:home}/bin/
+tmp = ${:home}/tmp/
+log = ${:var}/log/
+services = ${:etc}/service/
+scripts = ${:etc}/run/
+
+[deploy-resiliency-test]
+recipe = slapos.cookbook:wrapper
+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}
+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=runner slaprunner_rootinstance_name='${request-resilient-instance:name}'
+command-line = {{ bin_directory }}/runResiliencyTest ${:testnode-parameters} ${:test-parameters}
+wrapper-path = ${directory:scripts}/runKVMResiliencyTestSuite
+
+[deploy-standalone-resiliency-test]
+# Used to manually run the KVM test if we don't have a running testnode.
+recipe = slapos.cookbook:wrapper
+test-suite-title = slaprunner
+command-line = {{ bin_directory }}/runStandaloneResiliencyTest --test-suite-title=${:test-suite-title} ${deploy-resiliency-test:test-parameters}
+wrapper-path = ${directory:bin}/runStandaloneResiliencyTestSuite
+
+[request-resilient-instance]
+<= slap-connection
+recipe = slapos.cookbook:request
+software-url = ${slap-connection:software-release-url}
+software-type = resilient
+name = Resilient Instance (Root Instance)
+return = backend_url
+
+[slap-parameter]

software/slaprunner/instance.cfg

@@ -9,6 +9,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 recipe = slapos.cookbook:softwaretype
 default = ${template-runner:output}
 resilient = $${instance-resilient:rendered}
+test = $${instance-resilient-test:rendered}
 runner = ${template-runner:output}
 runner-import = ${instance-runner-import:output}
 runner-export = ${instance-runner-export:output}
@@ -24,16 +25,27 @@ extensions = jinja2.ext.do
 context = key buildout buildout:bin-directory
           key develop_eggs_directory buildout:develop-eggs-directory
           key eggs_directory buildout:eggs-directory
-          key slapparameter_dict slap-parameters:configuration
+          key slapparameter_dict slap-configuration:configuration
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
 import-list = file parts :template-parts-destination
               file replicated :template-replicated-destination
+mode = 0644
 
+[instance-resilient-test]
+recipe = slapos.recipe.template:jinja2
+template = ${template-resilient-test:location}/instance-resilient-test.cfg.jinja2
+rendered = $${buildout:directory}/template-resilient-test.cfg
+bin-directory = ${buildout:bin-directory}
+context =
+    key bin_directory instance-resilient-test:bin-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    key slapparameter_dict slap-configuration:configuration
 mode = 0644
 
-[slap-parameters]
-recipe = slapos.cookbook:slapconfiguration
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
 computer = $${slap-connection:computer-id}
 partition = $${slap-connection:partition-id}
 url = $${slap-connection:server-url}