resiliencetest: Move all resilient test related files into erp5testnode/testsuite

  Make the integration with erp5testnode separeted from original SR.
  Optimise KVM resilient tests by downloading the test image on the software release site,
  without change the original SR. (This will sabe internet and speed up result).

software/kvm/instance-kvm-resilient-test.cfg.jinja2 → software/erp5testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2

@@ -58,6 +58,6 @@ return = ipv6
 sla-computer_guid = ${slap-connection:computer-id}
 
 [slap-parameter]
-virtual-hard-drive-url = http://www.nexedi.org/static/slapos/kvm_resiliency_test/virtual.qcow2.gz
-virtual-hard-drive-md5sum = dd82c771f6f7738fb4b0fc1330ed8236
+virtual-hard-drive-url = {{ default_test_image_url }} 
+virtual-hard-drive-md5sum = {{ default_test_image_md5sum }}
 virtual-hard-drive-gzipped = true

software/erp5testnode/testsuite/instance.cfg.in

@@ -4,3 +4,19 @@ extends = ${template:output}
 [switch_softwaretype]
 default = $${:test}
 RootSoftwareInstance = $${:test}
+
+# Used for the test of resiliency. The system wants a "test" software_type.
+test = $${dynamic-template-resilient-test:rendered}
+
+[dynamic-template-resilient-test]
+recipe = slapos.recipe.template:jinja2
+template = ${template-resilient-test:location}/${template-resilient-test:filename}
+rendered = $${buildout:directory}/template-resilient-test.cfg
+bin-directory = ${buildout:bin-directory}
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    key slapparameter_dict slap-configuration:configuration
+    raw bin_directory ${buildout:bin-directory}
+    ${template-resilient-test:extra-context}
+mode = 0644

software/erp5testnode/testsuite/kvm.cfg

@@ -4,3 +4,24 @@ extends =
    testsuite.cfg
 
 parts += template-erp5testnode
+
+[default-test-image]
+recipe = hexagonit.recipe.download
+ignore-existing = true
+filename = ${:_buildout_section_name_}
+url = http://www.nexedi.org/static/slapos/kvm_resiliency_test/virtual.qcow.gz
+md5sum = dd82c771f6f7738fb4b0fc1330ed8236
+download-only = true
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template-resilient-test]
+filename = instance-kvm-resilient-test.cfg.jinja2
+md5sum = 71ddbdeb8769bcb0ebb3c9407ef7e36c 
+# Ingest extra-context, on a the final template-resilient-test rendering
+# always ingest raw values.
+extra-context =
+  raw default_test_image_url file://${default-test-image:location}/${default-test-image:filename}
+  raw default_test_image_md5 ${default-test-image:md5sum}
+
+  

software/erp5testnode/testsuite/slaprunner.cfg

@@ -4,3 +4,7 @@ extends =
    testsuite.cfg
 
 parts += template-erp5testnode
+
+[template-resilient-test]
+filename = instance-resilient-test.cfg.jinja2 
+md5sum = 268d07ed48199d34259aff1ba544d852 

software/erp5testnode/testsuite/testsuite.cfg

 [template-erp5testnode]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 4f68874a5d8cee326e3a080dcd8614e2 
+md5sum = e5adcd511bca060bfeccec48b57c635c 
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template]
 output = ${buildout:directory}/template-original.cfg
+
+[template-resilient-test]
+recipe = hexagonit.recipe.download
+ignore-existing = true
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+download-only = true
+on-update = true
+extra-context =

software/kvm/common.cfg

@@ -89,7 +89,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 721d3d665d6340e1e0cd1eb3e8cac6bc
+md5sum = 5c159864ce41394486867c27d65c2f50 
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -120,15 +120,6 @@ md5sum = 700676dff4a3835a9d6cde015d91922e
 download-only = true
 on-update = true
 
-[template-kvm-resilient-test]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
-md5sum = 5eda541b14be6bea18f4af911126bff1
-mode = 0644
-download-only = true
-on-update = true
-
 [template-kvm-import]
 recipe = hexagonit.recipe.download
 ignore-existing = true

software/kvm/instance.cfg.in

@@ -19,9 +19,6 @@ kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
 kvm-import = $${dynamic-template-kvm-import:rendered}
 kvm-export = $${dynamic-template-kvm-export:rendered}
 
-# Used for the test of resiliency. The system wants a "test" software_type.
-test = $${dynamic-template-kvm-resilient-test:rendered}
-
 frozen = ${instance-frozen:output}
 pull-backup = ${template-pull-backup:output}
 
@@ -159,13 +156,3 @@ context =
     raw gzip_binary ${gzip:location}/bin/gzip
 mode = 0644
 
-[dynamic-template-kvm-resilient-test]
-recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-resilient-test:location}/instance-kvm-resilient-test.cfg.jinja2
-rendered = $${buildout:directory}/template-kvm-resilient-test.cfg
-context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    key slapparameter_dict slap-configuration:configuration
-    raw bin_directory ${buildout:bin-directory}
-mode = 0644

software/slaprunner/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 80aa32f7b691296b688a469e776db5b5
+md5sum = 02755403c9f0b52d717160b0b2d0cfb7
 
 [template-runner]
 filename = instance-runner.cfg
@@ -41,10 +41,6 @@ md5sum = 852a2ed99af566d27e5e4403334a3376
 filename = instance-resilient.cfg.jinja2
 md5sum = a902b84ac7d1e29a7fdb06cbc7dec150
 
-[template-resilient-test]
-filename = instance-resilient-test.cfg.jinja2
-md5sum = 268d07ed48199d34259aff1ba544d852
-
 [template_nginx_conf]
 filename = nginx_conf.in
 md5sum = 2b06f7eb9a1d45d250d4b92a944db925

software/slaprunner/common.cfg

@@ -93,9 +93,6 @@ recipe = slapos.recipe.build:download
 < = download-base
 recipe = slapos.recipe.build:download
 
-[template-resilient-test]
-< = download-only-base
-
 [template_nginx_conf]
 < = download-only-base
 

software/slaprunner/instance.cfg

@@ -11,7 +11,6 @@ extends = ${template-resilient-templates:output}
 recipe = slapos.cookbook:softwaretype
 default = $${instance-base-runner:rendered}
 resilient = $${instance-resilient:rendered}
-test = $${instance-resilient-test:rendered}
 runner = $${instance-base-runner:rendered}
 runner-import = ${instance-runner-import:output}
 runner-export = $${template-runner-export:rendered}
@@ -48,18 +47,6 @@ 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
-
 [template-runner-export]
 recipe = slapos.recipe.template:jinja2
 template = ${instance-runner-export:target}