Commit 58b76d43 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Create a test wrappers in root partition.

parent 38395b7e
...@@ -203,7 +203,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 ...@@ -203,7 +203,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = d2b0f35e82bb0967fef99b3b7d37768e md5sum = c2cef018336278242624162ab2885b61
extra-context = extra-context =
key apache_location apache:location key apache_location apache:location
key aspell_location aspell:location key aspell_location aspell:location
...@@ -269,7 +269,7 @@ extra-context = ...@@ -269,7 +269,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = a24bd5283599807799adb2aeea1ad7ba md5sum = d58fcae1380f208954362ff2a439bb41
[template-neo] [template-neo]
< = download-base < = download-base
...@@ -284,7 +284,7 @@ md5sum = 8453652206eac7b165c86cf236b87cbf ...@@ -284,7 +284,7 @@ md5sum = 8453652206eac7b165c86cf236b87cbf
[template-zope] [template-zope]
< = download-base < = download-base
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = c5c13fb438aa2a4d9ce22880e16fc2cd md5sum = bc57fc59618efd07006d2aed0a0faddb
[template-balancer] [template-balancer]
< = download-base < = download-base
......
...@@ -50,6 +50,7 @@ return = ...@@ -50,6 +50,7 @@ return =
zope-address-list zope-address-list
extra-config = extra-config =
mysql-url-list mysql-url-list
mysql-test-url-list
memcached-url memcached-url
cloudooo-url cloudooo-url
kumofs-url kumofs-url
...@@ -69,6 +70,7 @@ extra-config = ...@@ -69,6 +70,7 @@ extra-config =
longrequest-logger-timeout longrequest-logger-timeout
port-base port-base
config-mysql-url-list = ${request-mariadb:connection-database-list} config-mysql-url-list = ${request-mariadb:connection-database-list}
config-mysql-test-url-list = ${request-mariadb:connection-test-database-list}
config-memcached-url = ${request-memcached-volatile:connection-url} config-memcached-url = ${request-memcached-volatile:connection-url}
config-cloudooo-url = ${request-cloudooo:connection-url} config-cloudooo-url = ${request-cloudooo:connection-url}
config-kumofs-url = ${request-memcached-persistent:connection-url} config-kumofs-url = ${request-memcached-persistent:connection-url}
......
...@@ -15,6 +15,32 @@ partition. No more (undefined result), no less (IndexError). ...@@ -15,6 +15,32 @@ partition. No more (undefined result), no less (IndexError).
-#} -#}
{% set ipv4 = (ipv4_set | list)[0] -%} {% set ipv4 = (ipv4_set | list)[0] -%}
[test-runner]
recipe = slapos.cookbook:erp5.test
certificate-authority-path = ${test-certificate-authority:ca-dir}
mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
kumofs-url = {{ slapparameter_dict['kumofs-url'] }}
memcached-url = {{ slapparameter_dict['memcached-url'] }}
cloudooo-url = {{ slapparameter_dict['cloudooo-url'] }}
test-instance-path = ${directory:unit-test-path}
prepend-path = ${buildout:bin-directory}
run-unit-test = ${buildout:bin-directory}/runUnitTest
run-test-suite = ${buildout:bin-directory}/runTestSuite
openssl-binary = ${test-certificate-authority:openssl-binary}
run-unit-test-binary = {{ parameter_dict['bin-directory'] }}/runUnitTest
run-test-suite-binary = {{ parameter_dict['bin-directory'] }}/runTestSuite
[test-certificate-authority]
recipe = slapos.cookbook:certificate_authority
openssl-binary = ${binary-link:target-directory}/bin/openssl
ca-dir = ${directory:test-ca-dir}
requests-directory = ${directory:ca-requests}
wrapper = ${directory:services}/test-ca
ca-private = ${directory:ca-private}
ca-certs = ${directory:ca-certs}
ca-newcerts = ${directory:ca-newcerts}
ca-crl = ${directory:ca-crl}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
...@@ -37,6 +63,13 @@ srv = ${buildout:directory}/srv ...@@ -37,6 +63,13 @@ srv = ${buildout:directory}/srv
tmp = ${buildout:directory}/tmp tmp = ${buildout:directory}/tmp
var = ${buildout:directory}/var var = ${buildout:directory}/var
promises = ${:etc}/promise promises = ${:etc}/promise
unit-test-path = ${:srv}/test-instance/unit_test
test-ca-dir = ${:srv}/test-ca
ca-requests = ${:test-ca-dir}/requests
ca-private = ${:test-ca-dir}/private
ca-certs = ${:test-ca-dir}/certs
ca-newcerts = ${:test-ca-dir}/newcerts
ca-crl = ${:test-ca-dir}/crl
[binary-link] [binary-link]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
...@@ -287,7 +320,7 @@ offline = true ...@@ -287,7 +320,7 @@ offline = true
extends = extends =
{{ parameter_dict['instance-logrotate-cfg'] }} {{ parameter_dict['instance-logrotate-cfg'] }}
parts += parts +=
binary-link test-runner
erp5-promise erp5-promise
{{ part_list | join('\n ') }} {{ part_list | join('\n ') }}
publish-zope publish-zope
......
...@@ -125,6 +125,7 @@ extra-context = ...@@ -125,6 +125,7 @@ extra-context =
raw software_type zodb-zeo raw software_type zodb-zeo
[dynamic-template-zope-parameters] [dynamic-template-zope-parameters]
bin-directory = {{ bin_directory }}
zope-conf-template = {{ template_zope_conf }} zope-conf-template = {{ template_zope_conf }}
instance-logrotate-cfg = {{ template_logrotate_base }} instance-logrotate-cfg = {{ template_logrotate_base }}
git = {{ git_location }} git = {{ git_location }}
......
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