Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
357d1099
Commit
357d1099
authored
May 16, 2018
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
recipe.erp5_test&erp5: define cloudooo-retry-count value in test
/reviewed-on
nexedi/slapos!329
parent
b2744ffe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
2 deletions
+10
-2
slapos/recipe/erp5_test/__init__.py
slapos/recipe/erp5_test/__init__.py
+1
-0
software/erp5/instance-erp5-input-schema.json
software/erp5/instance-erp5-input-schema.json
+5
-0
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+2
-2
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+1
-0
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+1
-0
No files found.
slapos/recipe/erp5_test/__init__.py
View file @
357d1099
...
@@ -69,6 +69,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -69,6 +69,7 @@ class Recipe(GenericBaseRecipe):
)
)
common_list
=
(
common_list
=
(
'--conversion_server_url='
+
cloudooo_url
,
'--conversion_server_url='
+
cloudooo_url
,
'--conversion_server_retry_count=%s'
%
self
.
options
[
'cloudooo-retry-count'
],
# BBB: We still have test suites that only accept the following 2 options.
# BBB: We still have test suites that only accept the following 2 options.
'--conversion_server_hostname=%s'
%
cloudooo_parsed
.
hostname
,
'--conversion_server_hostname=%s'
%
cloudooo_parsed
.
hostname
,
'--conversion_server_port=%s'
%
cloudooo_parsed
.
port
,
'--conversion_server_port=%s'
%
cloudooo_parsed
.
port
,
...
...
software/erp5/instance-erp5-input-schema.json
View file @
357d1099
...
@@ -194,6 +194,11 @@
...
@@ -194,6 +194,11 @@
},
},
"type"
:
"object"
"type"
:
"object"
},
},
"cloudooo-retry-count"
:
{
"description"
:
"Define retry count for cloudooo in network error case in test"
,
"type"
:
"integer"
,
"default"
:
2
},
"smtp"
:
{
"smtp"
:
{
"description"
:
"Mail queuing and relay service"
,
"description"
:
"Mail queuing and relay service"
,
"additionalProperties"
:
{
"additionalProperties"
:
{
...
...
stack/erp5/buildout.hash.cfg
View file @
357d1099
...
@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
...
@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
5eb5ff7491b9e47c647ecfd381a2e143
md5sum =
2431422c66082a6fb6a6be236ebacd5c
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
...
@@ -87,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba
...
@@ -87,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
3fdfbc82c450c35a9a444dfbc0a1c196
md5sum =
7fb40624bd0dcd96a1df03395da64ebd
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-erp5.cfg.in
View file @
357d1099
...
@@ -166,6 +166,7 @@ config-mysql-url-list = ${request-mariadb:connection-database-list}
...
@@ -166,6 +166,7 @@ config-mysql-url-list = ${request-mariadb:connection-database-list}
config-site-id = {{ dumps(site_id) }}
config-site-id = {{ dumps(site_id) }}
config-smtp-url = ${request-smtp:connection-url}
config-smtp-url = ${request-smtp:connection-url}
config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }}
config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
config-zodb-dict = {{ dumps(zodb_dict) }}
config-zodb-dict = {{ dumps(zodb_dict) }}
{% for server_type, server_dict in storage_dict.iteritems() -%}
{% for server_type, server_dict in storage_dict.iteritems() -%}
...
...
stack/erp5/instance-zope.cfg.in
View file @
357d1099
...
@@ -28,6 +28,7 @@ mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
...
@@ -28,6 +28,7 @@ mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
kumofs-url = {{ dumps(slapparameter_dict['kumofs-url']) }}
kumofs-url = {{ dumps(slapparameter_dict['kumofs-url']) }}
memcached-url = {{ dumps(slapparameter_dict['memcached-url']) }}
memcached-url = {{ dumps(slapparameter_dict['memcached-url']) }}
cloudooo-url = {{ dumps(slapparameter_dict['cloudooo-url']) }}
cloudooo-url = {{ dumps(slapparameter_dict['cloudooo-url']) }}
cloudooo-retry-count = {{ slapparameter_dict['cloudooo-retry-count'] }}
test-instance-path = ${directory:unit-test-path}
test-instance-path = ${directory:unit-test-path}
prepend-path = ${buildout:bin-directory}
prepend-path = ${buildout:bin-directory}
run-unit-test = ${buildout:bin-directory}/runUnitTest.real
run-unit-test = ${buildout:bin-directory}/runUnitTest.real
...
...
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