recipe.erp5_test&erp5: define cloudooo-retry-count value in test

/reviewed-on nexedi/slapos!329

slapos/recipe/erp5_test/__init__.py

@@ -69,6 +69,7 @@ class Recipe(GenericBaseRecipe):
     )
     common_list = (
       '--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.
       '--conversion_server_hostname=%s' % cloudooo_parsed.hostname,
       '--conversion_server_port=%s' % cloudooo_parsed.port,

software/erp5/instance-erp5-input-schema.json

@@ -194,6 +194,11 @@
       },
       "type": "object"
     },
+    "cloudooo-retry-count": {
+      "description": "Define retry count for cloudooo in network error case in test",
+      "type": "integer",
+      "default": 2
+    },
     "smtp": {
       "description": "Mail queuing and relay service",
       "additionalProperties": {

stack/erp5/buildout.hash.cfg

@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 5eb5ff7491b9e47c647ecfd381a2e143
+md5sum = 2431422c66082a6fb6a6be236ebacd5c
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -87,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 3fdfbc82c450c35a9a444dfbc0a1c196
+md5sum = 7fb40624bd0dcd96a1df03395da64ebd
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -166,6 +166,7 @@ config-mysql-url-list = ${request-mariadb:connection-database-list}
 config-site-id = {{ dumps(site_id) }}
 config-smtp-url = ${request-smtp:connection-url}
 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-zodb-dict = {{ dumps(zodb_dict) }}
 {% for server_type, server_dict in storage_dict.iteritems() -%}

stack/erp5/instance-zope.cfg.in

@@ -28,6 +28,7 @@ mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
 kumofs-url = {{ dumps(slapparameter_dict['kumofs-url']) }}
 memcached-url = {{ dumps(slapparameter_dict['memcached-url']) }}
 cloudooo-url = {{ dumps(slapparameter_dict['cloudooo-url']) }}
+cloudooo-retry-count = {{ slapparameter_dict['cloudooo-retry-count'] }}
 test-instance-path = ${directory:unit-test-path}
 prepend-path = ${buildout:bin-directory}
 run-unit-test = ${buildout:bin-directory}/runUnitTest.real