stack/erp5: Publish really required environment

OPENSSL_BINARY is not needed in the test case, only SQLBENCH_PATH has to be
provided, and perl shall be available in the PATH.

stack/erp5/buildout.cfg

@@ -61,6 +61,7 @@ extends =
   ../../component/userhosts/buildout.cfg
   ../../component/postfix/buildout.cfg
   ../../component/zbarlight/buildout.cfg
+  ../../component/perl/buildout.cfg
   ../monitor/buildout.cfg
   ../../stack/caucase/buildout.cfg
   ../../software/jupyter/software.cfg
@@ -278,6 +279,7 @@ context =
     key parts_directory buildout:parts-directory
     key openssl_location openssl:location
     key percona_toolkit_location percona-toolkit:location
+    key perl_dbd_mariadb_path perl-DBD-mariadb:perl-PATH
     key pixman_location pixman:location
     key poppler_location poppler:location
     key postfix_location postfix:location

stack/erp5/buildout.hash.cfg

@@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
 
 [template]
 filename = instance.cfg.in
-md5sum = 278781b66fc7b208d9090005019abb7a
+md5sum = a2423975b29ab023f64ce257d097e286
 
 [monitor-template-dummy]
 filename = dummy.cfg
@@ -82,7 +82,7 @@ md5sum = d400c3d449ce437a0ded77ee3d5c5df2
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 34b613d297a300d41c59c02ca12e6f84
+md5sum = 3a6c7dec898abc7d1506957154ef566e
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -51,7 +51,7 @@ environment +=
   TMP=${directory:tmp}
   TMPDIR=${directory:tmp}
   HOME=${buildout:directory}
-  PATH=${binary-link:target-directory}:{{ parameter_dict['coreutils'] }}/bin
+  PATH=${binary-link:target-directory}:{{ parameter_dict['coreutils'] }}/bin:{{ parameter_dict['perl_dbd_mariadb_path'] }}
   TZ={{ slapparameter_dict['timezone'] }}
   MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }}
   INSTANCE_HOME=${:instance-home}
@@ -443,7 +443,7 @@ wrapper-path = ${buildout:bin-directory}/runTestSuite
 < = run-common
 environment-extra =
   REAL_INSTANCE_HOME=${:instance-home}
-  OPENSSL_BINARY={{ openssl_bin }}/openssl
+  SQLBENCH_PATH={{ parameter_dict['sqlbench_path'] }}
   TEST_CA_PATH=${directory:ca-dir}
 instance-home = ${directory:unit-test-path}
 wrapper-path = ${directory:bin}/${:command-name}.real

stack/erp5/instance.cfg.in

@@ -97,6 +97,8 @@ zope-conf-template = {{ template_zope_conf }}
 run-zelenium-template = {{ template_run_zelenium }}
 6tunnel = {{ sixtunnel_location }}
 coreutils = {{ coreutils_location }}
+sqlbench_path = {{ mariadb_location }}/sql-bench
+perl_dbd_mariadb_path = {{ perl_dbd_mariadb_path }}
 dash = {{ dash_location }}
 jsl = {{ jsl_location }}
 link-binary = {{ dumps(zope_link_binary) }}
@@ -118,7 +120,6 @@ extra-context =
     import urlparse urlparse
     import hashlib hashlib
     import itertools itertools
-    raw openssl_bin {{ openssl_location}}/bin
 
 [dynamic-template-kumofs-parameters]
 <= default-dynamic-template-parameters