Implement max-process-timeout request variable

This variable is passed to testnode configuration.

slapos/recipe/erp5testnode/__init__.py

@@ -39,6 +39,7 @@ class Recipe(GenericBaseRecipe):
     CONFIG = {k.replace('-', '_'): v for k, v in options.iteritems()}
     CONFIG['PATH'] = os.environ['PATH']
 
+    CONFIG.setdefault('max_process_timeout', '')  # backward compatibility
     if self.options['instance-dict']:
       config_instance_dict = ConfigParser.ConfigParser()
       config_instance_dict.add_section('instance_dict')

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -19,6 +19,7 @@ httpd_software_access_port = %(httpd_software_access_port)s
 computer_id = %(computer_id)s
 server_url = %(server_url)s
 frontend_url = %(frontend_url)s
+max_process_timeout = %(max_process_timeout)s
 
 # Binaries
 git_binary = %(git_binary)s

software/erp5testnode/instance-default.cfg

@@ -61,6 +61,7 @@ httpd-log-directory = $${basedirectory:log}
 httpd-software-directory = $${directory:software}
 httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
 httpd-key-file = $${rootdirectory:etc}/httpd-private.key
+max-process-timeout = $${slap-parameter:max-process-timeout}
 
 configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
 log-file = $${basedirectory:log}/erp5testnode.log
@@ -175,6 +176,7 @@ config-https-only = true
 return = domain secure_access
 
 [slap-parameter]
+max-process-timeout =
 node-quantity = 1
 test-suite-master-url =
 instance-dict =

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

@@ -18,6 +18,11 @@
       "title": "Task Distribution URL",
       "description": "Url for the task distributor master on portal_task_distribution",
       "type": "string"
+    },
+    "max-process-timeout": {
+      "title": "Maximum process timeout (seconds)",
+      "description": "(Optional) Maximum timeout of testnode process. Defaults to internal configuration of ERP5TestNode software.",
+      "type": "integer"
     }
   }
 }

software/erp5testnode/software.cfg

@@ -56,7 +56,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum =  8e171816b6caef52ac75c2f8f6a69fc3
+md5sum =  029dacac11d73992fd1c204d1e2aa899
 
 [versions]
 PyXML = 0.8.5