slaprunner: Allow set software-root via parameters

  Allow set software-root via parameters allow the webrunner inside a erp5testnode,
  recover the the previous builds from previous resilient tests, and only update (instead build from scratch)
  This is a typical usage on the webrunner (keep updating SR), so there is no
  problem on use this approach on erp5testnode tests.

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

@@ -50,6 +50,10 @@ config-resiliency-backup-periodicity = */10 * * * *
 config-resilient-clone-number = 1
 config-ignore-known-hosts-file = false
 config-cpu-usage-ratio = 1
+# Use one external folder (same of erp5testnode for build the software
+# This is a way to preserve the latest software release build speeding up
+# the tests.)
+config-software-root = ${buildout:directory}/../../soft
 # XXX hardcoded
 #config-frontend-domain = google.com
 # XXX Hack to deploy Root Instance on the same computer as the type-test Instance

software/erp5testnode/testsuite/slaprunner.cfg

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

software/slaprunner/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 43b3f80bc368a5b246e0f0e80e7e3c01
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 07905ec872e84bc42c6ab089f5270ac2
+md5sum = 046f21b9541dbf0a7bab83a166263f3c
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -114,7 +114,7 @@ home = $${directory:srv}/runner/
 test = $${directory:srv}/test/
 project = $${:home}/project
 public = $${:home}/public
-software-root = $${:home}/software
+software-root = {{ slapparameter_dict.get('software-root', '$${:home}/software') }}
 instance-root = $${:home}/instance
 project-test = $${:test}/project
 software-test = $${:test}/software

stack/resilient/buildout.hash.cfg

@@ -31,7 +31,7 @@ md5sum = 7b4f8ac1a62680d624ac632f9601dab5
 
 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = 75686abd9cb8d6e1f4e15931e280fa56
+md5sum = 55ef107f499e5e604b8d277098618fed
 
 [template-parts]
 filename = template-parts.cfg.in

stack/resilient/template-replicated.cfg.in

@@ -91,6 +91,10 @@ return = ssh-public-key ssh-url notification-url ip takeover-url takeover-passwo
 
 pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push
 
+{% if slapparameter_dict.get("software-root") %}
+config-software-root = {{ slapparameter_dict.get("software-root") }}
+{% endif %}
+
 config-number = {{id}}
 config-name = {{namebase}}{{id}}
 config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}