Merge remote-tracking branch 'upstream/master' into zope4py3

software/erp5testnode/buildout.hash.cfg

@@ -14,8 +14,8 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = a0e249bc3e0af5c23c85c3b31314be5f
+md5sum = 9b33c3fc56e6ed68c9dc7f1d5530f67e
 
 [template-default]
 filename = instance-default.cfg.jinja.in
-md5sum = 96fb2221c8a91fb44dc5b931c29e0af9
+md5sum = 3959e9e5e7c9f05cb341520a34ba06c9

software/erp5testnode/instance-default.cfg.jinja.in

@@ -37,7 +37,13 @@ recipe = slapos.cookbook:erp5testnode
 slapos-directory = $${directory:slapos}
 working-directory = $${directory:testnode}
 test-suite-directory = $${directory:test-suite}
-shared-part-list = $${directory:shared}
+shared-part-list =
+{%- if 'shared-part-list' in slap_connection %}
+  {{ slap_connection['shared-part-list'] | indent(2) }}
+{%- else %}
+  {{ """${buildout:shared-part-list}""" | indent(2) }}
+{%- endif %}
+  $${directory:shared}
 proxy-host = {{ partition_ipv4 }}
 proxy-port = 5000
 log-directory = $${directory:log}

software/erp5testnode/instance.cfg

@@ -26,6 +26,7 @@ output = $${buildout:directory}/instance-default.cfg
 context =
   import json json
   jsonkey default_parameter_dict :default-parameters
+  section slap_connection slap-connection
   key slapparameter_dict slap-configuration:configuration
   key partition_ipv6 slap-configuration:ipv6-random
   key partition_ipv4 slap-configuration:ipv4-random

stack/slapos.cfg

@@ -296,7 +296,7 @@ sgmllib3k = 1.0.0
 simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
-slapos.cookbook = 1.0.326
+slapos.cookbook = 1.0.329
 slapos.core = 1.10.1
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25