Merge branch 'master' of https://lab.nexedi.com/nexedi/slapos

component/chromedriver/buildout.cfg

 # ChromeDriver - Webdriver for Chrome
-# http://chromedriver.chromium.org/
+# https://chromedriver.chromium.org/
 # This is a binary download with wrapper scripts.
 
 [buildout]
@@ -13,6 +13,10 @@ parts =
   chromedriver-wrapper
 
 
+[chromedriver-wrapper-91]
+<= chromedriver-wrapper
+wrapper-name = chromedriver-91
+part = ${chromedriver-91:location}
 
 [chromedriver-wrapper-2.41]
 <= chromedriver-wrapper
@@ -46,7 +50,7 @@ install =
 
 
 [chromedriver]
-<= chromedriver-2.41
+<= chromedriver-91
 
 [chromedriver-2.41]
 <= chromedriver-download
@@ -54,6 +58,11 @@ version = 2.41
 # Supports Chrome v67-69
 md5sum-x86_64 = fbd8b9561575054e0e7e9cc53b680a70
 
+[chromedriver-91]
+<= chromedriver-download
+version = 91.0.4472.101
+# Supports Chrome v91
+md5sum-x86_64 = cc43ba0babbfff7f22b48165ec8e8c81
 
 [chromedriver-download]
 # Installs chromedriver ${version}.

component/chromium/buildout.cfg

@@ -66,16 +66,27 @@ install =
   ))
     os.fchmod(f.fileno(), 0o755)
 
+[chromium-wrapper-91]
+<= chromium-wrapper
+wrapper-name = chromium-91
+part = ${chromium-91:location}
+
 [chromium-wrapper-69]
 <= chromium-wrapper
 wrapper-name = chromium-69
 part = ${chromium-69:location}
 
 
+[chromium]
+<= chromium-91
 
+[chromium-91]
+<= chromium-download
+version = 91.0.4472.114
 
-[chromium]
-<= chromium-69
+revision_x86-64 = 870763
+md5sum-x86_64 = 74eab41580469c2b8117cf396db823cb
+generation-x86_64 = 1617926496067901
 
 
 [chromium-69]
@@ -111,6 +122,7 @@ x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snaps
 library =
   ${atk:location}/lib
   ${at-spi2-atk:location}/lib
+  ${at-spi2-core:location}/lib
   ${alsa:location}/lib
   ${cairo:location}/lib
   ${cups:location}/lib
@@ -133,11 +145,14 @@ library =
   ${libXtst:location}/lib
   ${libXScrnSaver:location}/lib
   ${libXrandr:location}/lib
+  ${libdrm:location}/lib
   ${libexpat:location}/lib
   ${libffi:location}/lib
   ${libpng:location}/lib
   ${libpng12:location}/lib
   ${libxcb:location}/lib
+  ${libxkbcommon:location}/lib
+  ${libxshmfence:location}/lib
   ${libxml2:location}/lib
   ${mesa:location}/lib
   ${nspr:location}/lib

component/firefox/buildout.cfg

@@ -51,6 +51,11 @@ install =
   ))
     os.fchmod(f.fileno(), 0o755)
 
+[firefox-wrapper-78]
+<= firefox-wrapper
+wrapper-name = firefox-78
+part = ${firefox-78:location}
+
 [firefox-wrapper-68]
 <= firefox-wrapper
 wrapper-name = firefox-68
@@ -95,6 +100,12 @@ cache-dir =
 # would not be created.
 <= firefox-68
 
+[firefox-78]
+<= firefox-download
+version = 78.1.0esr
+i686-md5sum = 09595a1b9a99d17a618a51bc1f971e5e
+x86_64-md5sum = 06f4d488721ce7229d9a86cb4c6786f3
+
 [firefox-68]
 <= firefox-download
 version = 68.0.2esr

component/mariadb/mdev20693-mixin.cfg

 # To be extended after mariadb's buildout.cfg
 
-[mariadb]
+[mariadb-10.4]
 patches +=
   ${:_profile_base_location_}/mdev20693.patch#34ca907d6b36ba81d75bed118243f637

component/mesa/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   mesa
@@ -16,32 +17,33 @@ parts =
 [mesa]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.freedesktop.org/pub/mesa/11.0.3/mesa-11.0.3.tar.xz
-md5sum = bf9118bf0fbf360715cfe60baf7a1db5
+url = https://archive.mesa3d.org/mesa-18.0.0.tar.xz
+md5sum = c2a59fc5b56de3e197fa3a6023409e23
 configure-options =
-  --enable-static
   --disable-gles1
   --disable-gles2
-  --disable-dri
+  --enable-dri
   --disable-dri3
   --enable-egl
-  --disable-gbm
+  --enable-gbm
+  --enable-sysfs
   --disable-xvmc
   --disable-vdpau
   --disable-va
-  --enable-xlib-glx
-  --disable-shared-glapi
+  --disable-xlib-glx
+  --enable-shared-glapi
   --disable-driglx-direct
   --disable-gallium-llvm
   --with-gallium-drivers=
   --with-dri-drivers=
 environment =
   PATH=${autoconf:location}/bin:${bison:location}/bin:${flex:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libdrm:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   PYTHON2=${buildout:executable}
   ACLOCAL=${automake:location}/bin/aclocal -I${libtool:location}/share/aclocal -I${pkgconfig:location}/share/aclocal
   AUTOCONF=${autoconf:location}/bin/autoconf
   AUTOMAKE=${automake:location}/bin/automake
+  LDFLAGS=-Wl,-rpath=${libdrm:location}/lib -Wl,-rpath=${zlib:location}/lib
 make-options =
   -j1
   LIBTOOL=${libtool:location}/bin/libtool
@@ -57,3 +59,4 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${libdrm:location}/lib -Wl,-rpath=${zlib:location}/lib

component/wendelin.core/buildout.cfg

@@ -38,6 +38,12 @@ GO   = ${go:exe}
 # wcfs needs this:
 [gowork]
 cpkgpath += ${zlib:location}/lib/pkgconfig
+[wendelin.core-env]
+# `pkg-config --libs zlib` emits only -L, but not -Wl,-rpath
+# better set it via gowork:environment when "VAR += ..." support is there
+# environment +=
+#   CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
+CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
 
 
 [wendelin.core-repository]

component/xorg/buildout.cfg

@@ -2,20 +2,25 @@
 extends =
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
+  ../bison/buildout.cfg
   ../bzip2/buildout.cfg
   ../dash/buildout.cfg
   ../freetype/buildout.cfg
   ../gnutls/buildout.cfg
+  ../icu/buildout.cfg
   ../intltool/buildout.cfg
   ../libtool/buildout.cfg
   ../libuuid/buildout.cfg
   ../libxml2/buildout.cfg
   ../libxslt/buildout.cfg
+  ../meson/buildout.cfg
+  ../ninja/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../perl-XML-Parser/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
   ./buildout.hash.cfg
 
@@ -652,3 +657,43 @@ pkg_config_depends = ${libX11:location}/lib/pkgconfig:${xorgproto:pkg_config_dep
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
   PATH=${pkgconfig:location}/bin:%(PATH)s
+
+
+[libdrm]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@
+make-binary = ${ninja:location}/bin/ninja -C builddir
+url = https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz
+md5sum = 4e316ae1966a1a63c31a3885313a8fb8
+pkg_config_depends = ${pciaccess:location}/lib/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:${ninja:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${pciaccess:location}/lib -Wl,-rpath=@@LOCATION@@/lib
+
+
+[libxshmfence]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.gz
+md5sum = ab3940af0bd3d3cc91eb35ecd33a779a
+pkg_config_depends = ${xorgproto:pkg_config_depends}:${xorgproto:location}/share/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+
+[libxkbcommon]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@ -Denable-wayland=false -Denable-docs=false
+make-binary = ${ninja:location}/bin/ninja -C builddir
+
+url = https://xkbcommon.org/download/libxkbcommon-1.3.0.tar.xz
+md5sum = 00b5275ec1309a1d427a645de5861605
+pkg_config_depends = ${libxcb:pkg_config_depends}:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${icu4c:location}/lib/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:${ninja:location}/bin:${bison:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${libxcb:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${icu4c:location}/lib -Wl,-rpath=@@LOCATION@@/lib

slapos/recipe/switch_softwaretype.py

@@ -25,9 +25,8 @@
 #
 ##############################################################################
 
-
-from zc.buildout.buildout import Buildout
-
+from zc.buildout.buildout import Buildout, MissingOption, MissingSection
+from zc.buildout import UserError
 
 class SubBuildout(Buildout):
   """Run buildout in buildout, partially copied from infrae.buildout
@@ -71,8 +70,21 @@ class Recipe:
     self.buildout = buildout
     self.options = options
     self.name = name
-    self.software_type = buildout["slap-configuration"]["slap-software-type"]
-    section, key = self.options[self.software_type].split(":")
+    try:
+      self.software_type = buildout["slap-configuration"]["slap-software-type"]
+    except (MissingSection, MissingOption):
+      raise UserError("The section to retrieve slap partition parameters "
+                      "(with slapos.cookbook:slapconfiguration recipe or a derived one) "
+                      "must be named [slap-configuration].")
+    try:
+      section, key = self.options[self.software_type].split(":")
+    except MissingOption:
+      raise MissingOption("This software type (%s) isn't mapped. RootSoftwareInstance "
+                      "is the default software type." % self.software_type)
+    except ValueError:
+      raise UserError("The software types in the section [%s] must be separated "
+                      "by a colon such as: 'section:key', where key is usually 'rendered'. "
+                      "Don't use: ${section:key}" % self.name)
     self.base = self.buildout[section][key]
 
   def install(self):

software/backupserver/buildout.hash.cfg

@@ -46,7 +46,7 @@ md5sum = ae4a0043414336a521b524d9c95f1c68
 
 [template-pullrdiffbackup]
 filename = instance-pullrdiffbackup.cfg.in
-md5sum = c1f00c251298c2ab7fd095e7c4571d3b
+md5sum = c03595acae67565d4333fff07d629b61
 
 [template]
 filename = instance.cfg.in

software/backupserver/instance-pullrdiffbackup.cfg.in

@@ -194,9 +194,9 @@ virtual-depends =
 
 [nginx-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = nginx_listen.py
-config-hostname = $${nginx-configuration:ip}
+config-host = $${nginx-configuration:ip}
 config-port = $${nginx-configuration:port}
 
 [nginx-configuration]

software/caddy-frontend/buildout.hash.cfg

@@ -22,15 +22,15 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 28220d18308313d49a38d39c61a7e769
+md5sum = 8507a2ace2f789b92c522cc62ca5aace
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = ec421617d4932e8e1ae1e55a41fbfaab
+md5sum = 8beb438d06bbb0f917d13e182fb12d17
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = a745fb8d61a7e2646e3aa55edf73e5a6
+md5sum = 613f777a08373088cbaf7f51fd18ea70
 
 [profile-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -106,7 +106,7 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 225ce18b9218de4169327a206051a92e
+md5sum = 16901e9eeb0d4f87e708ad91e7756f12
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in

software/caddy-frontend/instance-apache-frontend.cfg.in

@@ -535,9 +535,9 @@ context =
 
 [trafficserver-promise-listen-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = trafficserver-port-listening.py
-config-hostname = ${trafficserver-variable:local-ip}
+config-host = ${trafficserver-variable:local-ip}
 config-port = ${trafficserver-variable:input-port}
 
 [trafficserver-ctl]
@@ -655,44 +655,44 @@ config-verification-script = ${promise-helper-last-configuration-state:rendered}
 
 [promise-caddy-frontend-v4-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv4_https.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${configuration:port}
 
 [promise-caddy-frontend-v4-http]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv4_http.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${configuration:plain_http_port}
 
 [promise-caddy-frontend-v6-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv6_https.py
-config-hostname = {{ instance_parameter_dict['ipv6-random'] }}
+config-host = {{ instance_parameter_dict['ipv6-random'] }}
 config-port = ${configuration:port}
 
 [promise-caddy-frontend-v6-http]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv6_http.py
-config-hostname = {{ instance_parameter_dict['ipv6-random'] }}
+config-host = {{ instance_parameter_dict['ipv6-random'] }}
 config-port = ${configuration:plain_http_port}
 
 [promise-backend-haproxy-http]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = backend_haproxy_http.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${backend-haproxy-configuration:http-port}
 
 [promise-backend-haproxy-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = backend_haproxy_https.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${backend-haproxy-configuration:https-port}
 
 [backend-haproxy-configuration]
@@ -981,9 +981,9 @@ context =
 
 [promise-slave-introspection-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = slave_introspection_https.py
-config-hostname = {{ instance_parameter_dict['ipv6-random'] }}
+config-host = {{ instance_parameter_dict['ipv6-random'] }}
 config-port = ${frontend-configuration:slave-introspection-https-port}
 
 [logrotate-entry-slave-introspection]

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -865,14 +865,14 @@ rendered = ${directory:etc}/nginx-rejected-slave.conf
 
 [promise-rejected-slave-publish-ip-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = rejected-slave-publish-ip-port-listening.py
-config-hostname = ${rejected-slave-publish-configuration:ip}
+config-host = ${rejected-slave-publish-configuration:ip}
 config-port = ${rejected-slave-publish-configuration:port}
 
 [rejected-slave-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 module = check_file_state
 name = rejected-slave.py
 config-filename = ${rejected-slave-json:rendered}

software/caddy-frontend/instance-kedifa.cfg.in

@@ -193,9 +193,9 @@ template = inline:
 
 [promise-expose-csr_id-ip-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = expose-csr_id-ip-port-listening.py
-config-hostname = ${expose-csr_id-configuration:ip}
+config-host = ${expose-csr_id-configuration:ip}
 config-port = ${expose-csr_id-configuration:port}
 
 [expose-csr_id]

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -633,9 +633,9 @@ template = inline:
 
 [promise-expose-csr_id-ip-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = expose-csr_id-ip-port-listening.py
-config-hostname = ${expose-csr_id-configuration:ip}
+config-host = ${expose-csr_id-configuration:ip}
 config-port = ${expose-csr_id-configuration:port}
 
 [expose-csr_id]

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

@@ -78,7 +78,7 @@
       "type": "string"
     },
     "developer-list": {
-      "description": "List of logins which should get the Developper role (required to modify portal_components' content), defaulting to inituser-login's value",
+      "description": "List of logins which should get the Developer role (required to modify portal_components' content), defaulting to inituser-login's value",
       "items": {
         "pattern": "^\\S+$",
         "type": "string"
@@ -215,7 +215,7 @@
               "type": "integer"
             },
             "timerserver-interval": {
-              "description": "Timerserver tick perdiod, in seconds, or 0 to disable",
+              "description": "Timerserver tick period, in seconds, or 0 to disable",
               "default": 5,
               "type": "number"
             },
@@ -439,7 +439,7 @@
                   "type": "string"
                 },
                 {
-                  "description": "Override value (parameter for maching nodes).",
+                  "description": "Override value (parameter for matching nodes).",
                   "type": [
                     "integer",
                     "string"
@@ -517,7 +517,7 @@
           "type": "boolean"
         },
         "node-count": {
-          "description": "Number of tests this instance can execute in parrallel. This must be at least equal to the number of nodes configured on testnode running the test",
+          "description": "Number of tests this instance can execute in parallel. This must be at least equal to the number of nodes configured on testnode running the test",
           "default": 3,
           "type": "integer"
         },
@@ -525,6 +525,101 @@
           "description": "Number of extra databases this instance tests will need.",
           "default": 3,
           "type": "integer"
+        },
+        "selenium": {
+          "default": {
+            "target": "firefox"
+          },
+          "examples": [
+            {
+              "target": "selenium-server",
+              "server-url": "https://selenium.example.com",
+              "desired-capabilities": {
+                "browserName": "firefox",
+                "version": "68.0.2esr",
+                "acceptInsecureCerts": true
+              }
+            },
+            {
+              "target": "selenium-server",
+              "server-url": "https://selenium.example.com",
+              "desired-capabilities": {
+                "browserName": "chrome",
+                "version": "91.0.4472.101"
+              }
+            }
+          ],
+          "oneOf": [
+            {
+              "type": "object",
+              "title": "Selenium Server",
+              "description": "Configuration for Selenium server",
+              "additionalProperties": false,
+              "required": [
+                "desired-capabilities",
+                "server-url",
+                "target"
+              ],
+              "properties": {
+                "target": {
+                  "description": "Target system",
+                  "type": "string",
+                  "const": "selenium-server"
+                },
+                "server-url": {
+                  "description": "URL of the selenium server",
+                  "type": "string",
+                  "format": "uri"
+                },
+                "verify-server-certificate": {
+                  "description": "Verify the SSL/TLS certificate of the selenium server when using HTTPS",
+                  "type": "boolean",
+                  "default": true
+                },
+                "server-ca-certificate": {
+                  "description": "PEM encoded bundle of CA certificates to verify the SSL/TLS certificate of the selenium server when using HTTPS",
+                  "type": "string",
+                  "default": "Root certificates from http://certifi.io/en/latest/"
+                },
+                "desired-capabilities": {
+                  "description": "Desired browser capabilities",
+                  "required": [
+                    "browserName"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "browserName": {
+                      "description": "Name of the browser being used",
+                      "type": "string",
+                      "examples": [
+                        "firefox",
+                        "chrome",
+                        "safari"
+                      ]
+                    },
+                    "version": {
+                      "description": "The browser version",
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            },
+            {
+              "type": "object",
+              "title": "Firefox",
+              "description": "Configuration for using firefox running as a sub-process",
+              "additionalProperties": false,
+              "properties": {
+                "target": {
+                  "description": "Target system",
+                  "const": "firefox",
+                  "type": "string",
+                  "default": "firefox"
+                }
+              }
+            }
+          ]
         }
       },
       "type": "object"

software/erp5/test/test/test_erp5.py

@@ -218,6 +218,45 @@ class TestBalancerPorts(ERP5InstanceTestCase):
         ]))
 
 
+class TestSeleniumTestRunner(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
+  """Test ERP5 can be instantiated with selenium server for test runner.
+  """
+  __partition_reference__ = 'sel'
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+        '_':
+        json.dumps({
+            'test-runner': {
+                'selenium': {
+                    "target": "selenium-server",
+                    "server-url": "https://example.com",
+                    "verify-server-certificate": False,
+                    "desired-capabilities": {
+                        "browserName": "firefox",
+                        "version": "68.0.2esr",
+                    }
+                }
+            }
+        })
+    }
+
+  def test_test_runner_configuration_json_file(self):
+    runUnitTest_script, = glob.glob(
+        self.computer_partition_root_path + "/../*/bin/runUnitTest.real")
+    config_file = None
+    with open(runUnitTest_script) as f:
+      for line in f:
+        if 'ERP5_TEST_RUNNER_CONFIGURATION' in line:
+          _, config_file = line.split('=')
+    assert config_file
+    with open(config_file.strip()) as f:
+      self.assertEqual(
+          f.read(),
+          json.dumps(json.loads(self.getInstanceParameterDict()['_'])['test-runner']))
+
+
 class TestDisableTestRunner(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
   """Test ERP5 can be instantiated without test runner.
   """

software/erp5testnode/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
 
 [template-default]
 filename = instance-default.cfg
-md5sum = d10958c62d0be8d0d051300d695f4f44
+md5sum = 24cc143b1886d443a4c29dcb8147a01c

software/erp5testnode/instance-default.cfg

@@ -243,9 +243,9 @@ instance-promises =
 
 [shellinabox-frontend-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = $${:_buildout_section_name_}.py
-config-hostname = $${shellinabox-frontend:hostname}
+config-host = $${shellinabox-frontend:hostname}
 config-port = $${shellinabox-frontend:port}
 
 [testnode-log-frontend-promise]

software/galene/test/README.md

+Tests for Galene software release

software/galene/test/setup.py

+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.galene'
+long_description = open("README.md").read()
+
+setup(
+    name=name,
+    version=version,
+    description="Test for SlapOS' Galene",
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    maintainer="Nexedi",
+    maintainer_email="info@nexedi.com",
+    url="https://lab.nexedi.com/nexedi/slapos",
+    packages=find_packages(),
+    install_requires=[
+        'slapos.core',
+        'slapos.libnetworkcache',
+        'requests',
+    ],
+    zip_safe=True,
+    test_suite='test',
+)

software/galene/test/test.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from __future__ import unicode_literals
+
+import os
+import requests
+
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+
+
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '../software.cfg')))
+
+
+class TestGalene(SlapOSInstanceTestCase):
+  __partition_reference__ = 'G'
+
+  def setUp(self):
+    self.connection_parameters = self.computer_partition.getConnectionParameterDict()
+
+  def test_url_get(self):
+    resp = requests.get(self.connection_parameters['url'], verify=False)
+    self.assertEqual(requests.codes.ok, resp.status_code)
+

software/gitlab/software.cfg

@@ -134,7 +134,7 @@ git-executable = ${git:location}/bin/git
 <= git-repository
 repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
 # 9.5.10 + NXD patches:
-revision = v9.5.10-8-gc290e22a08cb
+revision = v9.5.10-9-g69b0ffae00bf
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]

software/helloworld/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [instance-profile]
 filename = instance.cfg.in
-md5sum = dcb9d2f540e0e397c9346c8b0c05f233
+md5sum = c771dee1ef9aedad7c6ebf9418afe08e

software/helloworld/instance.cfg.in

@@ -87,7 +87,7 @@ wrapper-path = ${directory:service}/helloweb-${:kind}
 # promise, that checks that helloweb service is alive
 [helloweb-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = helloweb-${:kind}.py
 
 {# macro to instantiate service of `kind` to listen on `port` #}
@@ -102,8 +102,8 @@ port    = {{ port }}
 [helloweb-{{ kind }}-promise]
 <= helloweb-promise
 kind    = {{ kind }}
-config-hostname= ${helloweb-{{ kind }}:ipv6}
-config-port    = {{ port }}
+config-host = ${helloweb-{{ kind }}:ipv6}
+config-port = {{ port }}
 {% endmacro %}
 
 # services instantiation

software/html5as-base/instance.cfg.in

@@ -21,7 +21,16 @@ filename = instance-html5as.cfg
 context = 
   section buildout buildout
   section parameter_list profile-common
+# partition_ipv6 is the random ipv6 allocated to the local partition
+  key partition_ipv6 slap-configuration:ipv6-random
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${instance-html5as:rendered}
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = ${:default}
+default = instance-html5as:rendered
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}

software/html5as-base/instance_html5as.cfg.in

@@ -70,7 +70,7 @@ scgi_temp_path = ${:tmp}/scgi_temp_path
 nb_workers = 2
 
 # Network
-ip = ${slap-network-information:global-ipv6}
+ip = {{ partition_ipv6 }}
 port = 8081
 access_url = http://[${:ip}]:${:port}
 

software/html5as-base/software.cfg

@@ -27,7 +27,7 @@ recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/${:filename}
 filename = instance.cfg.in
-md5sum = 5a6ebc126bcad3cdff1b51fb51f82a35
+md5sum = 9bff013ed8b610f7cc5452c1582eccf2
 mode = 0644
 context =
   section buildout buildout
@@ -43,7 +43,7 @@ context =
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = 4a8c98cc5ca141f78f14fb9cec203cb8
+md5sum = 9b7ed68551cac5967915979383238669
 mode = 0644
 
 [template_nginx_conf]
@@ -71,8 +71,3 @@ mode = 0644
 recipe  = zc.recipe.egg
 eggs    =
     plone.recipe.command
-
-# Pin versions of eggs used that are not already pinned by stack/slapos.cfg
-[versions]
-slapos.recipe.template = 4.4
-plone.recipe.command = 1.1

software/html5as/buildout.hash.cfg

@@ -17,11 +17,11 @@
 
 [template-cfg]
 filename = instance.cfg.in
-md5sum = 0a7aceffa5222e88125b72da42ddedd7
+md5sum = 1b6d628b3a04497f525f860dd0003d84
 
 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = ec808dba866d85f7d37b85d75c13df2b
+md5sum = 2aee5fede6e804c1b9c1400f41f2f51e
 
 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in
@@ -45,4 +45,4 @@ md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
 
 [template_instance_replicate]
 _update_hash_filename_ = instance_replicate.cfg.in
-md5sum = 38d1d352307f79c9c99bf2a80a5c76b8
+md5sum = aef3b91f4cbaf6f7a14986bc8d1aba65

software/html5as/instance.cfg.in

@@ -13,7 +13,7 @@ tar_location = {{ tar_location }}
 curl_location = {{ curl_location }}
 template_nginx_conf = {{ template_nginx_conf_target }}
 template_mime_types = {{ template_mime_types_target }} 
-template_launcher = {{ template_launcher_target }} 
+template_launcher = {{ template_launcher_target }}
 template_index_html = {{ template_index_html_target }}
 template_graceful  = {{ template_graceful_target }}
 template_monitor = {{ template_monitor }}
@@ -26,24 +26,41 @@ filename = instance-html5as.cfg
 context =
   section buildout buildout
   section parameter_list profile-common
+# partition_ipv6 is the random ipv6 allocated to the local partition
+  key partition_ipv6 slap-configuration:ipv6-random
+  key slapparameter_dict slap-configuration:configuration
+  jsonkey default_parameter_dict :default-parameters
+default-parameters =
+  {
+    "title": "",
+    "download_url": "",
+    "port": 8081
+  }
 
 [instance-replicate]
 recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
 template = {{ template_instance_replicate }}
 rendered = ${buildout:directory}/${:filename}
 filename = instance-replicate-html5as.cfg
 context =
   section buildout buildout
   section parameter_list profile-common
-  key slapparameter_dict slap-parameters:configuration
+  key slapparameter_dict slap-configuration:configuration
+  jsonkey default_parameter_dict :default-parameters
+default-parameters =
+  {
+    "download_url": "",
+    "replicate-quantity": 1
+  }
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${instance-html5as:rendered}
-replicate = ${instance-replicate:rendered}
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = ${:default}
+default = instance-html5as:rendered
+replicate = instance-replicate:rendered
 
-# Section  needed to be added manually here to retrieve parameters
-[slap-parameters]
+[slap-configuration]
 recipe = slapos.cookbook:slapconfiguration
 computer = ${slap-connection:computer-id}
 partition = ${slap-connection:partition-id}

software/html5as/instance_html5as.cfg.in

@@ -3,6 +3,8 @@
 # Deploy html5as instance
 #
 #############################
+{% set parameter_dict = dict(default_parameter_dict, **slapparameter_dict) %}
+
 [buildout]
 parts =
     nginx_conf
@@ -76,8 +78,8 @@ scgi_temp_path = ${:tmp}/scgi_temp_path
 nb_workers = 2
 
 # Network
-ip = ${slap-network-information:global-ipv6}
-port = ${slap-parameter:port}
+ip = {{ partition_ipv6 }}
+port = {{ parameter_dict['port'] }}
 access_url = http://[${:ip}]:${:port}
 
 # Paths
@@ -138,7 +140,7 @@ stop-on-error = true
 # If the parameter is not provided it fallback to the default template
 command = 
   rm -rf ${html5as:docroot}/*; 
-  URL="${slap-parameter:download_url}"; 
+  URL = {{ parameter_dict['download_url'] }};
   if [ -n "$URL" ];
   then
     ${html5as:curl-binary} -Lks $URL | ${html5as:tar-binary} xzv -C ${html5as:docroot} --strip-components 1;
@@ -150,8 +152,9 @@ command =
 recipe = slapos.recipe.template:jinja2
 template = {{ parameter_list['template_index_html'] }}
 rendered = ${directory:srv}/index.html
+title = {{ parameter_dict['title'] }}
 context =
-  key title slap-parameter:title
+  key title :title
 
 ### Nginx Graceful
 [nginx-graceful]
@@ -165,9 +168,9 @@ context =
 # Port Listening checking promise
 [port-listening-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = nginx-port-listening.py
-config-hostname = ${html5as:ip}
+config-host = ${html5as:ip}
 config-port = ${html5as:port}
 
 # Use a port different from the default one in order to be able to
@@ -177,7 +180,7 @@ monitor-httpd-port = 8197
 
 # Monitor Stack also provides logrotate stack. We only need to extend
 # the logrotate-entry-base defined in instance-logrotate-base.cfg.in .
-# More parameters can be added following the logrotate-entry-base section  
+# More parameters can be added following the logrotate-entry-base section
 [logrotate-entry-nginx]
 <= logrotate-entry-base
 name = nginx
@@ -191,7 +194,7 @@ recipe = slapos.cookbook:publish
 # be deployed. The parameters needed for accessing monitoring will be published
 <= monitor-publish
 server_url = ${html5as:access_url}
-title = Title ${slap-parameter:title}!
+title = Title {{ parameter_dict['title'] }}!
 # Add dependency to the promise so that frontend sections are processed
 # and there is no need to declare the new part in buildout:parts
 server-cdn-url = ${html5as-frontend-promise:url}
@@ -220,8 +223,3 @@ name = html5as-http-frontend.py
 url = ${html5as-frontend:connection-secure_access}
 config-url = ${:url}
 config-check-secure = 1
-
-[slap-parameter]
-title =
-download_url =
-port = 8081

software/html5as/instance_replicate.cfg.in

-{% set replicate_quantity = slapparameter_dict.pop('replicate-quantity', '1') | int %}
+{%- set parameter_dict = dict(default_parameter_dict, **slapparameter_dict) %}
+{%- set replicate_quantity = int(parameter_dict['replicate-quantity']) %}
+# Set default title and port for each replicate based on requested quantity
+{%- for i in range(1, replicate_quantity + 1) %}
+{%- do parameter_dict.setdefault("title-%d" % i, "") %}
+{%- do parameter_dict.setdefault("port-%d" % i, 8081 + i) %}
+{%- endfor %}
+
+# Standard buildout section
 [buildout]
 parts =
     publish-connection-information
@@ -7,6 +15,11 @@ eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
 offline = true
 
+################################
+# Sections to Request instances
+################################
+
+# Macro section sharing request parameters
 [instance-request-base]
 <= slap-connection
 recipe = slapos.cookbook:request
@@ -17,29 +30,23 @@ software-type = default
 # What parameter are neede to be retrieved
 return = server_url server-cdn-url monitor-setup-url
 # Provided parameters
-config-title = ${slap-parameter:title}
-config-download_url = ${slap-parameter:download_url}
+config-download_url = {{ parameter_dict['download_url'] }}
 
+# Create request section in a loop.
 {% for i in range(1, replicate_quantity + 1) %}
 # Request a normal html5as instance
 [instance-{{ i }}]
 <= instance-request-base
 # Name of the instance
 name = instance-html5as-{{ i }}
-config-port = ${slap-parameter:port-{{ i }}}
-config-title = ${slap-parameter:title-{{ i }}}
-{%   if "sla-%s-computer-guid" % i in slapparameter_dict -%}
-sla-computer_guid = {{ slapparameter_dict["sla-%s-computer-guid" % i] }}
+config-port = {{ parameter_dict["port-%s" % i] }}
+config-title = {{ parameter_dict["title-%s" % i] }}
+{%   if "sla-%s-computer-guid" % i in parameter_dict -%}
+sla-computer_guid = {{ parameter_dict["sla-%s-computer-guid" % i] }}
 {%   endif -%}
 {% endfor %}
 
-[slap-parameter]
-download_url =
-{% for i in range(1, replicate_quantity + 1) %}
-title-{{ i }} =
-port-{{ i }} = 808{{ i }}
-{% endfor %}
-
+# Publish information to connect to the two instances
 [publish-connection-information]
 recipe = slapos.cookbook:publish
 {% for i in range(1, replicate_quantity + 1) %}

software/html5as/software.cfg

@@ -79,7 +79,3 @@ mode = 0644
 
 [template_instance_replicate]
 <= download-base
-
-# Pin versions of eggs used that are not already pinned by stack/slapos.cfg
-[versions]
-slapos.recipe.template = 4.4

software/htmlvalidatorserver/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 87781e6bcb523bb8434888d5f984f36c
 
 [template-validator]
 filename = instance-validator.cfg.in
-md5sum = 2be286e367e37ce9e504170cd3a08007
+md5sum = e2ab378e4eb4b418a958fc90309ca443
 
 [template]
 filename = instance.cfg.in

software/htmlvalidatorserver/instance-validator.cfg.in

@@ -55,9 +55,9 @@ scheme = https
 
 [tomcat-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = tomcat_listen.py
-config-hostname = $${tomcat-configuration:ip}
+config-host = $${tomcat-configuration:ip}
 config-port = $${tomcat-configuration:port}
 
 #################################

software/jscrawler/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 6c17361a49cfc47564063b867aab6e8c
 
 [template-jscrawler]
 filename = instance-jscrawler.cfg.jinja2.in
-md5sum = bdf9e67077cd5c3c140974bcc56422ad
+md5sum = fece076231740b414612da5ef3a1685a
 
 [template-jscrawler-builder]
 filename = template-jscrawler.builder.sh.in

software/jscrawler/instance-jscrawler.cfg.jinja2.in

@@ -60,9 +60,9 @@ log = ${httpd-wrapper:log-file}
 
 [httpd-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = httpd-listen.py
-config-hostname = ${httpd-wrapper:host}
+config-host = ${httpd-wrapper:host}
 config-port = ${httpd-wrapper:port}
 
 [jscrawler-wrapper]

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

@@ -23,6 +23,31 @@
       "example": "https://softinst1234.host.vifib.net/"
     },
     "test-runner": {
+      "default": {
+        "target": "firefox"
+      },
+      "examples": [
+        {
+          "target": "selenium-server",
+          "server-url": "https://selenium.example.com",
+          "desired-capabilities": {
+            "browserName": "firefox",
+            "version": "68.0.2esr",
+            "acceptInsecureCerts": true
+          }
+        },
+        {
+          "target": "selenium-server",
+          "server-url": "https://selenium.example.com",
+          "desired-capabilities": {
+            "browserName": "chrome",
+            "version": "91.0.4472.101"
+          }
+        },
+        {
+          "target": "node"
+        }
+      ],
       "oneOf": [
         {
           "type": "object",
@@ -46,14 +71,14 @@
               "format": "uri"
             },
             "verify-server-certificate": {
-              "description": "Verify the SSL/TLS Certificats of the selenium server when using HTTPS",
+              "description": "Verify the SSL/TLS certificate of the selenium server when using HTTPS",
               "type": "boolean",
               "default": true
             },
             "server-ca-certificate": {
-              "description": "PEM encoded bundle of CA Certificates to verify the SSL/TLS Certificate of the selenium server when using HTTPS",
+              "description": "PEM encoded bundle of CA certificates to verify the SSL/TLS certificate of the selenium server when using HTTPS",
               "type": "string",
-              "default": "root certificates from http://certifi.io/en/latest/"
+              "default": "Root certificates from http://certifi.io/en/latest/"
             },
             "desired-capabilities": {
               "description": "Desired browser capabilities",
@@ -63,8 +88,13 @@
               "type": "object",
               "properties": {
                 "browserName": {
-                  "description": "Name of the browser being used, for example firefox, chrome",
-                  "type": "string"
+                  "description": "Name of the browser being used",
+                  "type": "string",
+                  "examples": [
+                    "firefox",
+                    "chrome",
+                    "safari"
+                  ]
                 },
                 "version": {
                   "description": "The browser version",
@@ -77,7 +107,7 @@
         {
           "type": "object",
           "title": "Firefox",
-          "description": "Configuration for Firefox",
+          "description": "Configuration for using firefox running as a sub-process",
           "additionalProperties": false,
           "properties": {
             "target": {

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 0d34ff81779115bf899f7bc752877b70
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = bf0c01ac7493693bb57ebef00bb20fa0
+md5sum = 56e28a231bb869afce23ffbf966e8e41
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -47,7 +47,7 @@ md5sum = b617d64de73de1eed518185f310bbc82
 
 [template-nbd]
 filename = instance-nbd.cfg.jinja2
-md5sum = 6ea26f88252bf899c966d0f5675e7176
+md5sum = 259e06f289f68297e0609e4ab1af8e86
 
 [template-ansible-promise]
 filename = template/ansible-promise.in
@@ -75,7 +75,7 @@ md5sum = fb330a796fadb6cd5c85217f80a42af3
 
 [template-httpd]
 filename = instance-kvm-http.cfg.in
-md5sum = d657884d02105deffddee0edae4b50a6
+md5sum = f4bcde62e008c2da9c65617ba7f73f08
 
 [image-download-controller]
 _update_hash_filename_ = template/image-download-controller.py

software/kvm/instance-kvm-http.cfg.in

@@ -65,7 +65,7 @@ stop-on-error = true
 
 [httpd-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = apache-httpd.py
-config-hostname = ${apache-conf:ip}
+config-host = ${apache-conf:ip}
 config-port = ${apache-conf:port}

software/kvm/instance-kvm.cfg.jinja2

@@ -582,9 +582,9 @@ command-line = ${kvm-controller:rendered}
 
 [kvm-vnc-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = vnc_promise.py
-config-hostname = ${kvm-parameter-dict:vnc-ip}
+config-host = ${kvm-parameter-dict:vnc-ip}
 config-port = ${kvm-parameter-dict:vnc-port}
 
 [kvm-disk-image-corruption-bin]
@@ -704,9 +704,9 @@ wrapper = ${directory:bin}/websockify
 
 [novnc-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = novnc_promise.py
-config-hostname = ${novnc-instance:ip}
+config-host = ${novnc-instance:ip}
 config-port = ${novnc-instance:port}
 
 
@@ -797,9 +797,9 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [httpd-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = httpd.py
-config-hostname = ${httpd:host}
+config-host = ${httpd:host}
 config-port = ${httpd:port}
 {% endif %}
 

software/kvm/instance-nbd.cfg.jinja2

@@ -65,9 +65,9 @@ key = ${gen-passwd:passwd}
 
 [onetimeupload-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = onetimeupload_promise.py
-config-hostname = ${onetimeupload-instance:ip}
+config-host = ${onetimeupload-instance:ip}
 config-port = ${onetimeupload-instance:port}
 
 [publish-connection-information]

software/plantuml/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = d1dff3fc39eefc57b36dbaa195b6890e
+md5sum = c962079a88a6ce97d8ce20fa4e8edfd1
 
 [tomcat-server-xml]
 filename = server.xml.in

software/plantuml/instance.cfg.in

@@ -87,9 +87,9 @@ instance-promises =
 
 [tomcat-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = $${:_buildout_section_name_}.py
-config-hostname= $${tomcat-instance:ip}
+config-host = $${tomcat-instance:ip}
 config-port = $${tomcat-instance:port}
 
 [publish-connection-parameter]

software/powerdns/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = fddea033e1aa9d6147a1a47bd7cc4b62
 
 [template-powerdns]
 filename = instance-powerdns.cfg
-md5sum = 0920200cb05a68b1b4a161a927d9488f
+md5sum = c04c3b490e7f9f35af3d204a9df51f35
 
 [template-pdns-configuration]
 _update_hash_filename_ = template/pdns.conf.jinja2
@@ -26,7 +26,7 @@ md5sum = 20c37ea06a8fa405bc02470d5115fd11
 
 [template-dns-replicate]
 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = 504d15f0bbf0e515d5ff16070f1ac802
+md5sum = 4ff993a39da03d9d66d7c0f98efeb1e0
 
 [iso-list]
 _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -73,9 +73,9 @@ sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }}
 
 [{{promise_section_title}}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = {{promise_section_title}}.py
-config-hostname = {{ '${' ~ request_section_title ~ ':connection-powerdns-ipv6}' }}
+config-host = {{ '${' ~ request_section_title ~ ':connection-powerdns-ipv6}' }}
 config-port = {{ '${' ~ request_section_title ~ ':connection-powerdns-port}' }}
 
 {%  do monitor_url_list.append('${' ~ request_section_title ~ ':connection-monitor-base-url}') -%}

software/powerdns/instance-powerdns.cfg

@@ -137,9 +137,9 @@ extra-context =
 # Promises
 [pdns-promise-listen-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = pdns-port-listening.py
-config-hostname = $${pdns:ipv4}
+config-host = $${pdns:ipv4}
 config-port = $${pdns:port}
 
 [publish-connection-informations]

software/proftpd/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = efb4238229681447aa7fe73898dffad4
 
 [instance-default]
 filename = instance-default.cfg.in
-md5sum = dae19ec06f8da9fa2980a6d2bdf3da54
+md5sum = c6dce31a36e4e13de62687e9888aeb77
 
 [proftpd-config-file]
 filename = proftpd-config-file.cfg.in

software/proftpd/instance-default.cfg.in

@@ -86,9 +86,9 @@ template = inline:{{ slapparameter_dict['ssh-key'] | indent }}
 
 [proftpd-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = ${:_buildout_section_name_}.py
-config-hostname = ${proftpd:ipv6}
+config-host = ${proftpd:ipv6}
 config-port = ${proftpd:sftp-port}
 
 

software/pureftpd/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [instance-profile]
 filename = instance.cfg.in
-md5sum = 134ed1cf1f6de63b14425031eb5c9043
+md5sum = 500b773d1a63a6a895f9b8038a582b05

software/pureftpd/instance.cfg.in

@@ -33,12 +33,12 @@ pureftpd-dir = ${:srv}/pureftpd/
 
 [check-port-listening-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = check_nginx_port.py
 
 [pureftpd-listen-promise]
 <= check-port-listening-promise
-config-hostname = ${pureftpd:ipv6}
+config-host = ${pureftpd:ipv6}
 config-port = ${pureftpd:ftp-port}
 
 [pureftpd-userinfo]

software/re6stnet/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 71531ed9c9b79fa769ab367e7ea2d2a5
 
 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 2309889cf3f5bc57ba63d389e662fc21
+md5sum = 870c34cf58acaaee21c71182dd3cb0cf
 
 [template-apache-conf]
 filename = apache.conf.in

software/re6stnet/instance-re6stnet.cfg.in

@@ -170,16 +170,16 @@ context =
 
 [re6st-registry-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = re6st-registry.py
-config-hostname = ${re6st-registry:ipv4}
+config-host = ${re6st-registry:ipv4}
 config-port = ${re6st-registry:port}
 
 [apache-registry-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = apache-re6st-registry.py
-config-hostname = ${apache-conf:ipv6}
+config-host = ${apache-conf:ipv6}
 config-port = ${apache-conf:port}
 
 [publish]

software/repman/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8a08be95a04f1a47098c4fdef80bdfed
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = 1d6eba3984b3e2009682f6ce49b8ac4d
+md5sum = 0c173313b48d0005c46d968db1c8ab5f
 
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in

software/repman/instance-repman.cfg.jinja2.in

@@ -216,23 +216,23 @@ depends =
 
 [proxysql-{{ name }}-admin-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = proxysql-{{ name }}-admin-port-listening.py
-config-hostname=  {{ ipv4 }}
+config-host =  {{ ipv4 }}
 config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-admin-port}' }}
 
 [proxysql-{{ name }}-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = proxysql-{{ name }}-port-listening.py
-config-hostname=  {{ ipv4 }}
+config-host =  {{ ipv4 }}
 config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }}
 
 [proxysql-{{ name }}-ipv6-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = proxysql-{{ name }}-ipv6-port-listening.py
-config-hostname=  {{ ip }}
+config-host =  {{ ip }}
 config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }}
 
 {% set service_name = "proxysql-" ~ name -%}
@@ -403,16 +403,16 @@ context =
 
 [repman-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = repman_service_listen.py
-config-hostname = ${repman-parameter:ipv4}
+config-host = ${repman-parameter:ipv4}
 config-port = ${repman-parameter:port}
 
 [repman-listen-ssl-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = repman_service_ssl_listen.py
-config-hostname = ${repman-parameter:ipv4}
+config-host = ${repman-parameter:ipv4}
 config-port = ${repman-parameter:secure-port}
 
 [nginx-conf]

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = eea51d25c292c7ea305229184e380814
+md5sum = 973a43eb3cb4b663476987b7e64aae11

software/seleniumserver/instance-selenium.cfg.in

@@ -115,11 +115,23 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
 java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
 port = 7779
 
+[selenium-server-node-instance-firefox-78]
+<= selenium-server-node-instance
+capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-78:version},firefox_binary=${firefox-wrapper-78:location}
+java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
+port = 7780
+
 [selenium-server-node-instance-chromium-69]
 <= selenium-server-node-instance
 capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-69:version},chrome_binary=${chromium-wrapper-69:location}
 java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-2.41:location}
-port = 7780
+port = 7781
+
+[selenium-server-node-instance-chromium-91]
+<= selenium-server-node-instance
+capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-91:version},chrome_binary=${chromium-wrapper-91:location}
+java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-91:location}
+port = 7782
 
 
 [selenium-server-admin-password]
@@ -264,27 +276,29 @@ instance-promises =
   $${selenium-server-node-firefox-52-listen-promise:name}
   $${selenium-server-node-firefox-60-listen-promise:name}
   $${selenium-server-node-firefox-68-listen-promise:name}
+  $${selenium-server-node-firefox-78-listen-promise:name}
   $${selenium-server-node-instance-chromium-69-listen-promise:name}
+  $${selenium-server-node-instance-chromium-91-listen-promise:name}
 
 
 [check-port-listening-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = $${:_buildout_section_name_}.py
 
 [sshd-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${sshd-address:hostname}
+config-host = $${sshd-address:hostname}
 config-port = $${sshd-address:port}
 
 [selenium-server-frontend-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${selenium-server-frontend-instance:ip}
+config-host = $${selenium-server-frontend-instance:ip}
 config-port = $${selenium-server-frontend-instance:port}
 
 [selenium-server-hub-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${selenium-server-hub-instance:hostname}
+config-host = $${selenium-server-hub-instance:hostname}
 config-port = $${selenium-server-hub-instance:port}
 
 # Promise waiting for all nodes to be registered
@@ -294,8 +308,8 @@ module = check_command_execute
 name = $${:_buildout_section_name_}.py
 config-command =
   $${selenium-server-check-nodes-registered:rendered} $${selenium-server-hub-instance:api-url} $${:expected-node-count}
-# We have 4 nodes with 3 slots each
-expected-node-count = 12
+# We have 6 nodes with 3 slots each
+expected-node-count = 18
 
 [selenium-server-check-nodes-registered]
 recipe = slapos.recipe.template:jinja2
@@ -313,24 +327,34 @@ template =
 
 [selenium-server-node-firefox-52-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${selenium-server-node-instance-firefox-52:hostname}
+config-host = $${selenium-server-node-instance-firefox-52:hostname}
 config-port = $${selenium-server-node-instance-firefox-52:port}
 
 [selenium-server-node-firefox-60-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${selenium-server-node-instance-firefox-60:hostname}
+config-host = $${selenium-server-node-instance-firefox-60:hostname}
 config-port = $${selenium-server-node-instance-firefox-60:port}
 
 [selenium-server-node-firefox-68-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${selenium-server-node-instance-firefox-68:hostname}
+config-host = $${selenium-server-node-instance-firefox-68:hostname}
 config-port = $${selenium-server-node-instance-firefox-68:port}
 
+[selenium-server-node-firefox-78-listen-promise]
+<= check-port-listening-promise
+config-host = $${selenium-server-node-instance-firefox-78:hostname}
+config-port = $${selenium-server-node-instance-firefox-78:port}
+
 [selenium-server-node-instance-chromium-69-listen-promise]
 <= check-port-listening-promise
-config-hostname = $${selenium-server-node-instance-chromium-69:hostname}
+config-host = $${selenium-server-node-instance-chromium-69:hostname}
 config-port = $${selenium-server-node-instance-chromium-69:port}
 
+[selenium-server-node-instance-chromium-91-listen-promise]
+<= check-port-listening-promise
+config-host = $${selenium-server-node-instance-chromium-91:hostname}
+config-port = $${selenium-server-node-instance-chromium-91:port}
+
 
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish

software/seleniumserver/software.cfg

@@ -73,5 +73,9 @@ post-install =
 post-install =
   ${symlink-extra-fonts-to-firefox-fonts-dir:install}
 
+[firefox-78]
+post-install =
+  ${symlink-extra-fonts-to-firefox-fonts-dir:install}
+
 [versions]
 plone.recipe.command = 1.1

software/seleniumserver/test/test.py

@@ -426,6 +426,14 @@ class TestFirefox68(
   desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='68.0.2esr')
   user_agent = 'Gecko/20100101 Firefox/68.0'
 
+class TestFirefox78(
+    BrowserCompatibilityMixin,
+    SeleniumServerTestCase,
+    ImageComparisonTestCase,
+):
+  desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='78.1.0esr')
+  user_agent = 'Gecko/20100101 Firefox/78.0'
+
 
 class TestChrome69(
     BrowserCompatibilityMixin,
@@ -434,3 +442,12 @@ class TestChrome69(
 ):
   desired_capabilities = dict(DesiredCapabilities.CHROME, version='69.0.3497.0')
   user_agent = 'Chrome/69.0.3497.0'
+
+
+class TestChrome91(
+    BrowserCompatibilityMixin,
+    SeleniumServerTestCase,
+    ImageComparisonTestCase,
+):
+  desired_capabilities = dict(DesiredCapabilities.CHROME, version='91.0.4472.114')
+  user_agent = 'Chrome/91.0.4472.0'

software/slapos-master/buildout.hash.cfg

@@ -14,11 +14,11 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = c341609c8d0cfe240a3a2ae35bd713b6
+md5sum = 387c7d2a3cb899acbd4966c007f4edff
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 9c67c77eab5195b2674e340fb44c48a2
+md5sum = 67022177ad0f08511af426888cf2738e
 
 [template-apache-backend-conf]
 filename = apache-backend.conf.in

software/slapos-master/instance-balancer.cfg.in

@@ -185,9 +185,9 @@ input = inline:
 [{{ section('apache-promise') }}]
 # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = apache.py
-config-hostname = {{ ipv4 }}
+config-host = {{ ipv4 }}
 config-port = {{ apache_dict.values()[0][0] }}
 
 [{{ section('publish') }}]

software/slapos-master/instance-erp5.cfg.in

@@ -254,6 +254,7 @@ config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
 config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
 config-test-runner-node-count = {{ dumps(test_runner_node_count) }}
 config-wcfs_enable = {{ dumps(wcfs_enable) }}
+config-test-runner-configuration = {{ dumps(slapparameter_dict.get('test-runner', {})) }}
 software-type = zope
 
 {% set global_publisher_timeout = slapparameter_dict.get('publisher-timeout') -%}

software/slapos-sr-testing/software-py3.cfg

@@ -13,6 +13,7 @@ extra-eggs +=
 [template]
 extra =
 # The following list is for SR whose buildout runs only with Python 3.
+  galene ${slapos.test.galene-setup:setup}
   helloworld ${slapos.test.helloworld-setup:setup}
   jupyter ${slapos.test.jupyter-setup:setup}
   monitor ${slapos.test.monitor-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -183,6 +183,11 @@ setup = ${slapos-repository:location}/software/repman/test/
 egg = slapos.test.jscrawler
 setup = ${slapos-repository:location}/software/jscrawler/test/
 
+[slapos.test.galene-setup]
+<= setup-develop-egg
+egg = slapos.test.galene
+setup = ${slapos-repository:location}/software/galene/test/
+
 [slapos.core-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/slapos.core.git
@@ -237,6 +242,7 @@ extra-eggs =
   ${slapos.test.repman-setup:egg}
   ${slapos.test.caucase-setup:egg}
   ${slapos.test.jscrawler-setup:egg}
+  ${slapos.test.galene-setup:egg}
   ${slapos.test.html5as-setup:egg}
   ${slapos.test.html5as-base-setup:egg}
   ${slapos.test.fluentd-setup:egg}

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 9f367deb7597957e7108bee719b78bcc
+md5sum = ebdecea5c1653ed752e06fbc8be7e6b2
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -622,16 +622,16 @@ monitor-password = $${monitor-publish-parameters:monitor-password}
 
 [slaprunner-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = slaprunner.py
-config-hostname = $${slaprunner:ipv6}
+config-host = $${slaprunner:ipv6}
 config-port = $${slaprunner:runner_port}
 
 [runner-sshd-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = runner-sshd.py
-config-hostname = $${slap-network-information:global-ipv6}
+config-host = $${slap-network-information:global-ipv6}
 config-port = $${runner-sshd-port:port}
 
 [slap-parameter]
@@ -866,9 +866,9 @@ log = $${runnerdirectory:home}/instance/*/.slapgrid/log/instance.log $${runnerdi
 
 [supervisord-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = supervisord.py
-config-hostname = $${slaprunner:ipv4}
+config-host = $${slaprunner:ipv4}
 config-port = $${supervisord:port}
 
 [slapos-supervisord-promise]
@@ -879,9 +879,9 @@ config-command = ${buildout:bin-directory}/slapos node supervisorctl --cfg=$${sl
 
 [slapos-proxy-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = slaproxy.py
-config-hostname = $${slaprunner:ipv4}
+config-host = $${slaprunner:ipv4}
 config-port = $${slaprunner:proxy_port}
 
 # XXX Monitor

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 11274189a4492204e046fef45fdd809c
+md5sum = 557dec61b7bf58601051575234e7fd05
 
 [instance]
 _update_hash_filename_ = instance.cfg.in

software/theia/instance-theia.cfg.jinja.in

@@ -77,16 +77,16 @@ instance-promises =
 
 [theia-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = $${:_buildout_section_name_}.py
-config-hostname = $${theia-instance:ip}
+config-host = $${theia-instance:ip}
 config-port = $${theia-instance:port}
 
 [frontend-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = $${:_buildout_section_name_}.py
-config-hostname = $${frontend-instance:ip}
+config-host = $${frontend-instance:ip}
 config-port = $${frontend-instance:port}
 
 [remote-frontend-url-available-promise]
@@ -107,10 +107,10 @@ config-check-secure = 1
 
 [slapos-standalone-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 # XXX promise plugins can not contain "slapos" in their names
 name = standalone-listen-promise.py
-config-hostname = $${slapos-standalone-instance:hostname}
+config-host = $${slapos-standalone-instance:hostname}
 config-port = $${slapos-standalone-instance:port}
 
 [slapos-autorun-promise]

software/turnserver/buildout.hash.cfg

@@ -19,8 +19,8 @@ md5sum = 776c7de2054f78ba79382c22d85018be
 
 [template-turnserver]
 filename = instance-turnserver.cfg.jinja2.in
-md5sum = df8768f165036dbe0435bd1678b9deb3
+md5sum = 480f69e2f21a24f52bb2eb80bfb3f8ea
 
 [template-insecure-turnserver]
 filename = instance-insecure-turnserver.cfg.jinja2.in
-md5sum = e88678b9f322251a201860a13f4db6b8
+md5sum = 99c38cd20846eb3153d0392e6b81062c

software/turnserver/instance-insecure-turnserver.cfg.jinja2.in

@@ -54,9 +54,9 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [promise-check-turnserver-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = turnserver-port-listening.py
-config-hostname = {{ listining_ip }}
+config-host = {{ listining_ip }}
 config-port = {{ turn_port }}
 
 [publish-connection-information]

software/turnserver/instance-turnserver.cfg.jinja2.in

@@ -120,16 +120,16 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [promise-check-turnserver-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = turnserver-port-listening.py
-config-hostname = {{ listining_ip }}
+config-host = {{ listining_ip }}
 config-port = {{ turn_port }}
 
 [promise-check-turnserver-tls-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = turnserver-tls-port-listening.py
-config-hostname = {{ listining_ip }}
+config-host = {{ listining_ip }}
 config-port = {{ turn_tls_port }}
 
 [publish-connection-information]

stack/erp5/buildout.cfg

@@ -708,7 +708,7 @@ uuid = 1.30
 validictory = 1.1.0
 xfw = 0.10
 xupdate-processor = 0.4
-selenium = 3.8.0
+selenium = 3.14.1
 scikit-image = 0.14.0
 PyWavelets = 0.5.2
 networkx = 2.1

stack/erp5/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 7d064777c1c4e7b275b255db4f4b1da9
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
-md5sum = e91c0fbd0df441884f7422fa7976053c
+md5sum = fed6dd2bdc389b4fc7e7b7ca32c5d4b6
 
 [template-zope-conf]
 filename = zope.conf.in
@@ -50,7 +50,7 @@ md5sum = 1102c3e37a5a2e8aa2d8a2607ab633c8
 
 [template-postfix]
 filename = instance-postfix.cfg.in
-md5sum = bbf84495576a3dbc522524895e9640ff
+md5sum = 2a68a3e7c5c509cbd4cfa9e670ac91c7
 
 [template-postfix-master-cf]
 filename = postfix_master.cf.in
@@ -70,15 +70,15 @@ md5sum = 7a14019abf48ca100eb94d9add20f5ae
 
 [template]
 filename = instance.cfg.in
-md5sum = 8bd7f89b7c1e453ecc952659a01347e6
+md5sum = bbef65b4edeb342f08309604ca3717d5
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = f33e82cb68924decb77142b79dce4fab
+md5sum = 49b7e029c7fca7c95d3bfd8876d1a632
 
 [template-zeo]
 filename = instance-zeo.cfg.in
-md5sum = 0648e38bd5d3a15bb9f93264932740b9
+md5sum = 79b6b422df512b5a075eba54a6895a01
 
 [template-zodb-base]
 filename = instance-zodb-base.cfg.in
@@ -86,11 +86,11 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = e495f7225a49f61c501ccc496a976d63
+md5sum = 58ca95f6e0c067702a03fc3be66d50c1
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 8d3694226b6cbed961f6d608b6d6d294
+md5sum = c6c1b3e4b2f3c6f256153dcfe9fbecad
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -303,9 +303,9 @@ certificate-and-key = ${directory:etc}/certificate-and-key-generated.pem
 [{{ section('haproxy-promise') }}]
 <= monitor-promise-base
 # Check any haproxy port in ipv4, expect other ports and ipv6 to behave consistently
-module = check_port_listening
+module = check_socket_listening
 name = haproxy.py
-config-hostname = {{ ipv4 }}
+config-host = {{ ipv4 }}
 config-port = {{ haproxy_dict.values()[0][0] }}
 
 [{{ section('publish') }}]

stack/erp5/instance-erp5.cfg.in

@@ -260,6 +260,7 @@ config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
 config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
 config-test-runner-node-count = {{ dumps(test_runner_node_count) }}
 config-wcfs_enable = {{ dumps(wcfs_enable) }}
+config-test-runner-configuration = {{ dumps(slapparameter_dict.get('test-runner', {})) }}
 software-type = zope
 
 {% set global_publisher_timeout = slapparameter_dict.get('publisher-timeout') -%}

stack/erp5/instance-kumofs.cfg.in

@@ -86,8 +86,8 @@ rendered = ${directory:srv}/exporter.exclude
 # Deploy zope promises scripts
 [promise-template]
 <= monitor-promise-base
-module = check_port_listening
-config-hostname = ${kumofs-instance:ip}
+module = check_socket_listening
+config-host = ${kumofs-instance:ip}
 config-port = ${kumofs-instance:server-listen-port}
 
 [promise-kumofs-server]

stack/erp5/instance-postfix.cfg.in

@@ -80,9 +80,9 @@ wrapper-path = ${directory:run}/munnel
 
 [{{ section('munnel-promise') }}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = munnel.py
-config-hostname = {{ ip }}
+config-host = {{ ip }}
 config-port = {{ milter_port }}
 {% endif -%}
 
@@ -262,9 +262,9 @@ wrapper-path = ${directory:run}/postfix-master
 
 [{{ section('postfix-promise') }}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = postfix.py
-config-hostname = {{ ip }}
+config-host = {{ ip }}
 config-port = {{ tcpv4_port }}
 
 [{{ section('promise-check-computer-memory') }}]

stack/erp5/instance-zeo.cfg.in

@@ -55,9 +55,9 @@ post = test ! -s {{ "${" ~ zeo_section_name ~":pid-path}" }} || {{ bin_directory
 
 [{{ section(zeo_section_name ~ "-promise") }}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = zeo-{{ family }}.py
-config-hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }}
+config-host = {{ "${" ~ zeo_section_name ~ ":ip}" }}
 config-port = {{ "${" ~ zeo_section_name ~ ":port}" }}
 
 {% endfor -%}
@@ -89,9 +89,9 @@ tidstorage-wrapper = ${directory:services}/tidstoraged
 
 [{{ section("promise-tidstorage") }}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = tidstorage.py
-config-hostname = ${tidstorage:ip}
+config-host = ${tidstorage:ip}
 config-port = ${tidstorage:port}
 {% endif -%}
 

stack/erp5/instance-zope.cfg.in

@@ -358,9 +358,9 @@ hash-existing-files =
 
 [{{ section("promise-" ~ name) }}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = {{ name }}.py
-config-hostname = {{ ipv4 }}
+config-host = {{ ipv4 }}
 config-port = {{ port }}
 
 {% if use_ipv6 -%}
@@ -373,9 +373,9 @@ ipv4-port = {{ port }}
 
 [{{ section("promise-tunnel-" ~ name) }}]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = {{ zope_tunnel_base_name }}.py
-config-hostname = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }}
+config-host = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }}
 config-port = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6-port}' }}
 {% else -%}
 {%   do publish_list.append((ipv4 ~ ":" ~ port, thread_amount, webdav)) -%}
@@ -470,6 +470,7 @@ environment-extra =
   REAL_INSTANCE_HOME=${:instance-home}
   SQLBENCH_PATH={{ parameter_dict['sqlbench_path'] }}
   TEST_CA_PATH=${directory:ca-dir}
+  ERP5_TEST_RUNNER_CONFIGURATION=${test-runner-configuration:rendered}
 {%- if wsgi %}
   erp5_wsgi=1
 {%- endif %}
@@ -488,6 +489,12 @@ command-line =
   --persistent_memcached_server_hostname=erp5-memcached-persistent
   --persistent_memcached_server_port={{ port_dict['erp5-memcached-persistent'] }}
 
+[test-runner-configuration]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:etc}/${:_buildout_section_name_}.json
+template = inline:
+  {{ json.dumps(slapparameter_dict['test-runner-configuration']) }}
+
 [{{ section('runUnitTest') }}]
 < = run-test-common
 command-name = runUnitTest

stack/erp5/instance.cfg.in

@@ -128,6 +128,7 @@ extra-context =
     import urlparse urlparse
     import hashlib hashlib
     import itertools itertools
+    import json json
 import-list =
     file instance_zodb_base context:template-zodb-base
 

stack/lamp/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 5c953c0f5d3376718eb9c4030288647a
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
-md5sum = a20bb27c0077b5a7252bda06ba7e069d
+md5sum = 4afee4377fa9cbc1e4ff80647b2f279c
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in

stack/lamp/instance-apache-php.cfg.in

@@ -207,9 +207,9 @@ backend-url = ${apache-php-configuration:url}
 [promise]
 # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = apache-httpd-port-listening.py
-config-hostname = ${apache-php-configuration:ip}
+config-host = ${apache-php-configuration:ip}
 config-port = ${apache-php-configuration:port}
 
 [slap-parameter]

stack/monitor/README.md

@@ -95,9 +95,9 @@ You will use slapos.cookbook:promise.plugin to generate your promise script into
 
     [promise-check-site]
     <= monitor-promise-base
-    module = check_port_listening
+    module = check_socket_listening
     name = check_site.py
-    config-hostname = ${publish:ipv6}
+    config-host = ${publish:ipv6}
     config-port = 2020
     config-foo = bar
 

stack/resilient/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = afb54d1aafd5854116028bc63501409b
+md5sum = 9ceceeee21fa90837c887d2d6866859e
 
 [pbsready-import]
 filename = pbsready-import.cfg.in

stack/resilient/pbsready.cfg.in

@@ -212,9 +212,9 @@ wrapper-path = $${basedirectory:scripts}/sshd-graceful
 
 [sshd-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = sshd.py
-config-hostname = $${slap-network-information:global-ipv6}
+config-host = $${slap-network-information:global-ipv6}
 config-port = $${sshd-port:port}
 
 #----------------

stack/slapos.cfg

@@ -198,7 +198,7 @@ slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.46
 slapos.recipe.cmmi = 0.17
 slapos.recipe.template = 4.6
-slapos.toolbox = 0.119
+slapos.toolbox = 0.122
 stevedore = 1.21.0:whl
 subprocess32 = 3.5.4
 unicodecsv = 0.14.1