Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
88df1be5
Commit
88df1be5
authored
Jul 23, 2013
by
Vincent Pelletier
Committed by
Julien Muchembled
Aug 06, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Do not install a test runner when there are no test databases.
parent
7820d7fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+3
-2
No files found.
stack/erp5/buildout.cfg
View file @
88df1be5
...
@@ -284,7 +284,7 @@ md5sum = 4d2207931975e580d04d0b0506034564
...
@@ -284,7 +284,7 @@ md5sum = 4d2207931975e580d04d0b0506034564
[template-zope]
[template-zope]
< = download-base
< = download-base
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
f1245467092b4457f4363f9b7bc65e98
md5sum =
a3d1f6298d132426a9752935bb91d4af
link-binary =
link-binary =
${coreutils:location}/bin/basename
${coreutils:location}/bin/basename
${coreutils:location}/bin/cat
${coreutils:location}/bin/cat
...
...
stack/erp5/instance-zope.cfg.in
View file @
88df1be5
...
@@ -15,7 +15,8 @@ partition. No more (undefined result), no less (IndexError).
...
@@ -15,7 +15,8 @@ partition. No more (undefined result), no less (IndexError).
-#}
-#}
{% set ipv4 = (ipv4_set | list)[0] -%}
{% set ipv4 = (ipv4_set | list)[0] -%}
[test-runner]
{% if slapparameter_dict['mysql-test-url-list'] -%}
[{{ section('test-runner') }}]
recipe = slapos.cookbook:erp5.test
recipe = slapos.cookbook:erp5.test
certificate-authority-path = ${test-certificate-authority:ca-dir}
certificate-authority-path = ${test-certificate-authority:ca-dir}
mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
...
@@ -40,6 +41,7 @@ ca-private = ${directory:ca-private}
...
@@ -40,6 +41,7 @@ ca-private = ${directory:ca-private}
ca-certs = ${directory:ca-certs}
ca-certs = ${directory:ca-certs}
ca-newcerts = ${directory:ca-newcerts}
ca-newcerts = ${directory:ca-newcerts}
ca-crl = ${directory:ca-crl}
ca-crl = ${directory:ca-crl}
{%- endif %}
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -300,7 +302,6 @@ develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -300,7 +302,6 @@ develop-eggs-directory = {{ develop_eggs_directory }}
extends =
extends =
{{ parameter_dict['instance-logrotate-cfg'] }}
{{ parameter_dict['instance-logrotate-cfg'] }}
parts +=
parts +=
test-runner
erp5-promise
erp5-promise
{{ part_list | join('\n ') }}
{{ part_list | join('\n ') }}
publish-zope
publish-zope
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment