Commit 70a97144 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: parameterize the shared folder

In test nodes we put the software_root folder out of the webrunner so we
can keep it for the following tests. Except that the shared folder has
been introduced by default recently, and it is still inside the webrunner.

Thus, between 2 tests the webrunner is deleted, so the shared parts are too,
but not the SR folder (which is marked as completed). Then in the successive tests
the software release fails to build, or the insances fail to isntanciate.
parent 5c22e5a3
No related merge requests found
......@@ -54,6 +54,7 @@ config-cpu-usage-ratio = 1
# This is a way to preserve the latest software release build speeding up
# the tests.)
config-software-root = ${buildout:directory}/../../soft
config-buildout-shared-folder = ${buildout:directory}/../../shared
config-no-ipv4-frontend = true
# XXX hardcoded
#config-frontend-domain = google.com
......
......@@ -7,7 +7,7 @@ parts += template-erp5testnode
[template-resilient-test]
filename = instance-resilient-test.cfg.jinja2
md5sum = b366f23bbac55d9686485dd2d9531a8b
md5sum = cf34be404bdd93a72df9c593f8762cb2
[exporter-default-configuration]
# Define shorter interaction to speed up tests
......
......@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
[template-runner]
filename = instance-runner.cfg
md5sum = 19475112d4dccee1263798c67fd2351b
md5sum = bacb2d1a38d3a512025e861debdc75b2
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
......
......@@ -150,7 +150,7 @@ project = $${:home}/project
public = $${:home}/public
software-root = {{ slapparameter_dict.get('software-root', '$${:home}/software') }}
instance-root = $${:home}/instance
shared-root = $${:home}/shared
shared-root = $${slap-parameter:buildout-shared-folder}
project-test = $${:test}/project
software-test = $${:test}/software
instance-test = $${:test}/instance
......@@ -702,6 +702,7 @@ instance-name =
monitor-cors-domains =
monitor-interface-url =
monitor-httpd-port = 8386
buildout-shared-folder = $${runnerdirectory:home}/shared
[slapos-cfg]
recipe = slapos.recipe.template:jinja2
......@@ -711,7 +712,7 @@ mode = 700
context =
section slaprunner slaprunner
import codecs codecs
raw buildout_shared_part_list_dump ${template-buildout-shared-part-list:output}
raw buildout_shared_part_list_dump $${slaprunner:buildout-shared-part-list-dump}
[slapos-test-cfg]
recipe = slapos.recipe.template:jinja2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment