Merge branch 'master' into master+ZODB4-wc2

* master:
  ZEO: v↑ ZEO5 (5.2.2 -> 5.2.3)  +  dependencies
  software/repman: retry requests to prevent flaky test
  software/erp5: tcpv4-port is not required for kumofs and smtp
  software/{erp5,jstestnode}: define default for testrunner oneOf schemas
  software/*: set "type": "object" at root of schemas
  software/nextcloud: fix copy & pasted description in schema

component/ZEO/buildout.cfg

@@ -65,9 +65,9 @@ egg     = ZEO
 eggs    = ${:egg}
 
 egg-versions =
-  ZEO = 5.2.2
-  trollius = 2.2.post1
-  futures = 3.2.0
+  ZEO = 5.2.3
+  trollius = 2.2.1
+  futures = 3.3.0
 
 
 # ZEO4-wc2 is ZEO4 version with patches for wendelin.core 2 to work correctly.

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

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "extends": "./schema-definitions.json#",
   "properties": {
     "tcpv4-port": {

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

 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Parameters to instantiate ERP5",
+  "type": "object",
   "additionalProperties": false,
   "definitions": {
     "routing-rule-list": {
@@ -564,7 +565,8 @@
                 "target": {
                   "description": "Target system",
                   "type": "string",
-                  "const": "selenium-server"
+                  "const": "selenium-server",
+                  "default": "selenium-server"
                 },
                 "server-url": {
                   "description": "URL of the selenium server",

software/erp5/instance-kumofs-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "required": [
-    "tcpv4-port"
-  ],
   "properties": {
     "tcpv4-port": {
       "allOf": [

software/erp5/instance-smtp-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "required": [
-    "tcpv4-port"
-  ],
   "type": "object",
   "properties": {
     "tcpv4-port": {

software/fluentd/instance-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "description": "Parameters to instantiate Fluentd",
   "additionalProperties": false,
   "properties": {

software/grafana/instance-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Parameters to instantiate Grafana",
+  "type": "object",
   "additionalProperties": false,
   "properties": {
     "smtp-server": {

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

 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Parameters to instantiate JSTestNode",
+  "type": "object",
   "additionalProperties": false,
   "required": [
     "test-suite",
@@ -63,7 +64,8 @@
             "target": {
               "description": "Target system",
               "type": "string",
-              "const": "selenium-server"
+              "const": "selenium-server",
+              "default": "selenium-server"
             },
             "server-url": {
               "description": "URL of the selenium server",
@@ -127,7 +129,8 @@
             "target": {
               "description": "Target system",
               "const": "node",
-              "type": "string"
+              "type": "string",
+              "default": "node"
             }
           }
         }

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

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "description": "Parameters to instantiate Jupyter",
   "properties": {
     "frontend-instance-guid": {

software/monitor/instance-default-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "properties": {
     "dummy": {
       "title": "dummy",

software/neoppod/instance-neo-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Parameters to instantiate a NEO cluster. See https://lab.nexedi.com/nexedi/neoppod/blob/master/neo.conf for more information.",
+  "type": "object",
   "definitions": {
     "neo-cluster": {
       "additionalProperties": false,

software/nextcloud/nextcloud-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Parameters to instantiate Grafana",
+  "description": "Parameters to instantiate NextCloud",
+  "type": "object",
   "additionalProperties": false,
   "properties": {
     "domain": {

software/proftpd/instance-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Parameters to instantiate ProFTPd",
+  "type": "object",
   "additionalProperties": false,
   "properties": {
     "port": {

software/pureftpd/instance-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Parameters to instantiate Pure-FTPd",
+  "type": "object",
   "additionalProperties": false,
   "properties": {
     "port": {

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

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "properties": {
     "ipv6-prefix": {
       "title": "Ipv6 prefix to use to setup the new re6st network",

software/re6stnet/instance-re6stnet-slave-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "properties": {}
 }

software/repman/test/test.py

@@ -26,6 +26,7 @@
 ##############################################################################
 
 import os
+import time
 from six.moves.urllib.parse import urljoin
 
 import requests
@@ -68,16 +69,21 @@ class TestRepman(SlapOSInstanceTestCase):
     )
     self.assertEqual(resp.status_code, requests.codes.ok)
 
-    resp = requests.get(
-        urljoin(self.url, '/api/clusters'),
-        params={
-            'query': '{"method":"GET","isArray":false}',
-        },
-        headers=headers,
-        verify=False,
-    )
-    self.assertEqual(resp.status_code, requests.codes.ok)
-    cluster, = resp.json()
+    for i in range(20):
+      resp = requests.get(
+          urljoin(self.url, '/api/clusters'),
+          params={
+              'query': '{"method":"GET","isArray":false}',
+          },
+          headers=headers,
+          verify=False,
+      )
+      self.assertEqual(resp.status_code, requests.codes.ok)
+      cluster, = resp.json()
+      if cluster['isProvision'] and cluster['isFailable'] and not cluster['isDown']:
+        break
+      time.sleep(i)
+
     self.assertTrue(cluster['isProvision'])
     self.assertTrue(cluster['isFailable'])
     self.assertFalse(cluster['isDown'])

software/slaprunner/instance-runner-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "properties": {
     "instance-name": {
       "title": "Instance Name",

software/theia/instance-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "description": "Parameters to instantiate Theia",
   "additionalProperties": false,
   "properties": {

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

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
   "extends": "./schema-definitions.json#",
   "properties": {
     "tcpv4-port": {