Update Release Candidate

6dd245da · Ophélie Gagnard · ede5af97 · 02af7601 · 6dd245da · ede5af97
Commit 6dd245da authored Sep 22, 2022 by Ophélie Gagnard
33 changed files
--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
@@ -25,6 +25,7 @@ configure-options =
  --disable-fam
  --disable-xattr
  --disable-man
+  --with-python=${buildout:executable}
 environment =
  PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
@@ -33,8 +34,3 @@ environment =
  LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
  PCRE_CFLAGS=-I${pcre:location}/include
  PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
-post-install = rm %(location)s/bin/gtester-report
-[x86-cygwin-glib]
-patches =
-  ${:_profile_base_location_}/cygwin-glib-2.28.8-src.patch
--- a/component/glib/cygwin-glib-2.28.8-src.patch
+++ b/component/glib/cygwin-glib-2.28.8-src.patch
--- glib/gstrfuncs.c~	2012-12-30 14:51:30.000000000 +0800
-+++ glib/gstrfuncs.c	2012-12-30 14:51:50.203125000 +0800
-@@ -1423,7 +1423,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) 
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -14,7 +14,6 @@ extends =
  ../libtool/buildout.cfg
  ../m4/buildout.cfg
  ../perl/buildout.cfg
-  ../python-2.7/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xorg/buildout.cfg
  ../icu/buildout.cfg
@@ -82,7 +81,7 @@ configure-options =
  --disable-static
  --disable-gtk-doc-html
 environment =
-  PATH=${python2.7:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${harfbuzz:location}/lib -Wl,-rpath=${harfbuzz:location}/lib

--- a/component/popt/buildout.cfg
+++ b/component/popt/buildout.cfg
@@ -9,6 +9,3 @@ url = http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 md5sum = 450f2f636e6a3aa527de803d0ae76c5a
 configure-options =
  --disable-static
-[x86-cygwin-popt]
-patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
--- a/software/beremiz-ide/software.cfg
+++ b/software/beremiz-ide/software.cfg
@@ -47,6 +47,13 @@ part = python2.7
 [open62541]
 # Beremiz need it to be in folder parts/open62541
 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
+configure-options =
+  -DBUILD_SHARED_LIBS=OFF
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_SUBSCRIPTIONS=ON
+  -DUA_NAMESPACE_ZERO=REDUCED
 shared = false
 post-install =
  mkdir -p @@LOCATION@@/build/bin

--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -102,7 +102,7 @@ md5sum = 1c866272ec0ea0c161f0c0d80cb6e584
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = b757e0409ec3e70679a8fc4aab4a065f
+md5sum = 40fe46a1fe653406b18ca46351d195b8
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in

--- a/software/caddy-frontend/instance-kedifa.cfg.in
+++ b/software/caddy-frontend/instance-kedifa.cfg.in
@@ -280,9 +280,19 @@ command =
  [ ! -f ${:file} ] && {{ software_parameter_dict['curl'] }}/bin/curl -s -g -X POST https://[${kedifa-config:ip}]:${kedifa-config:port}/reserve-id --cert ${kedifa-config:certificate} --cacert ${kedifa-config:ca-certificate} > ${:file}.tmp && mv ${:file}.tmp ${:file}
 update-command = ${:command}
-[auth-random]
+[cleanup-auth-ready]
+# Cleans auth-ready as some slaves can appear and be configured, but then
+# become removed before auth-random kicks in
 recipe = slapos.recipe.build
 directory = ${directory:auth-ready}
+init =
+  import os
+  if os.path.isdir(options['directory']):
+    os.system("find %s -type f -name *-auth-random -size 0 -delete" % (options['directory'],))
+[auth-random]
+recipe = slapos.recipe.build
+directory = ${cleanup-auth-ready:directory}
 auth-ready = ${directory:auth-ready}/${:_buildout_section_name_}
 init =
  import os

--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt
@@ -113,7 +113,7 @@
      "monitor-username": "admin",
      "plain_http_port": "11080",
      "port": "11443",
-      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
    },
    "full_address_list": [],
    "instance_title": "caddy-frontend-1",

--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt
@@ -115,7 +115,7 @@
      "monitor-username": "admin",
      "plain_http_port": "11080",
      "port": "11443",
-      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
    },
    "full_address_list": [],
    "instance_title": "caddy-frontend-1",

--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt
@@ -115,7 +115,7 @@
      "monitor-username": "admin",
      "plain_http_port": "11080",
      "port": "11443",
-      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
    },
    "full_address_list": [],
    "instance_title": "caddy-frontend-1",

--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt
@@ -117,7 +117,7 @@
      "monitor-username": "admin",
      "plain_http_port": "11080",
      "port": "11443",
-      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@enable-http2-default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_dummy-cached\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@dummy-cached_key-generate-auth-url@@?auth=\"}, \"_enable-http2-default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-default_key-generate-auth-url@@?auth=\"}, \"_enable-http2-false\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-false_key-generate-auth-url@@?auth=\"}, \"_enable-http2-true\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@/@@dummy-cached_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@enable-http2-true_key-generate-auth-url@@?auth=\"}}"
    },
    "full_address_list": [],
    "instance_title": "caddy-frontend-1",

--- a/software/caddy-frontend/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.zz_test_file_list_log.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.zz_test_file_list_log.txt
@@ -41,6 +41,9 @@ T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
 T-2/var/log/httpd/_custom_domain_wildcard_access_log
 T-2/var/log/httpd/_custom_domain_wildcard_backend_log
 T-2/var/log/httpd/_custom_domain_wildcard_error_log
+T-2/var/log/httpd/_disabled-cookie-list-simple_access_log
+T-2/var/log/httpd/_disabled-cookie-list-simple_backend_log
+T-2/var/log/httpd/_disabled-cookie-list-simple_error_log
 T-2/var/log/httpd/_disabled-cookie-list_access_log
 T-2/var/log/httpd/_disabled-cookie-list_backend_log
 T-2/var/log/httpd/_disabled-cookie-list_error_log

--- a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt
--- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt
--- a/software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
+++ b/software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
@@ -18,4 +18,4 @@ md5sum = 8357771b70efd0740561b1cb46f6955e
 [template-deploy-test]
 filename = instance.cfg.in
-md5sum = 062e677990ca0cd0c0396993c58b46a2
+md5sum = 1faa52013b12b1753bcaff0b1309ad90
--- a/software/erp5testnode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2
+++ b/software/erp5testnode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2
@@ -30,8 +30,8 @@ sla-computer_guid = ${slap-connection:computer-id}
 # Tested image
 # Passed by request
-config-virtual-hard-drive-url = {{ slapparameter_dict.get('image-to-test-url') }}
+config-virtual-hard-drive-url = ${image-to-test:url}
-config-virtual-hard-drive-md5sum = {{ slapparameter_dict.get('image-to-test-md5sum') }}
+config-virtual-hard-drive-md5sum = ${image-to-test:md5sum}
 # The test script
 config-bootstrap-script-url = {{ in_vm_test_script }}#{{ in_vm_test_script_md5 }}
@@ -58,6 +58,24 @@ return =
  nat-rule-port-tcp-443
  nat-rule-port-tcp-80
+[image-to-test]
+# This section tries to replace the download URL by the file:// URL of an already downloaded image
+recipe = slapos.recipe.build
+init = 
+  options['url'] = options['input-url']
+  for md5sum, url in self.buildout['image-repository'].items():
+    if md5sum == options['md5sum']:
+      print("Using pre-downloaded image", url)
+      options['url'] = url
+      break
+input-url = {{ slapparameter_dict.get('image-to-test-url') }}
+md5sum = {{ slapparameter_dict.get('image-to-test-md5sum') }}
+[image-repository]
+{% for md5sum, url in test_image_repository.items() %}
+{{ md5sum }} = file://{{ url }}
+{% endfor %}
 [directory]
 recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}

--- a/software/erp5testnode/testsuite/deploy-test/instance.cfg.in
+++ b/software/erp5testnode/testsuite/deploy-test/instance.cfg.in
@@ -50,3 +50,10 @@ context =
    raw in_vm_test_script_md5 ${deploy-script-controller-script:md5sum}
    raw waittime ${deploy-script-controller-script:waittime}
    raw tries ${deploy-script-controller-script:tries}
+    section test_image_repository test-image-repository
+[test-image-repository]
+${download-image-debian-9:md5sum} = ${download-image-debian-9:target}
+${download-image-debian-10:md5sum} = ${download-image-debian-10:target}
+${download-image-debian-11:md5sum} = ${download-image-debian-11:target}
--- a/software/erp5testnode/testsuite/deploy-test/software.cfg
+++ b/software/erp5testnode/testsuite/deploy-test/software.cfg
@@ -56,5 +56,24 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
+[download-image]
+recipe = slapos.recipe.build:download
+shared = true
+[download-image-debian-9]
+<= download-image
+url = http://bit.ly/2IRi8Kg
+md5sum = 2b113e3cd8276b9740189622603d6f99
+[download-image-debian-10]
+<= download-image
+url = http://shacache.org/shacache/9d3e6d017754fdd08e5ecf78093dec27fd792fb183df6146006adf003b6f4b98c0388d5a11566627101f7855d77f60e3dd4ba7ce66850f4a8f030573b904d5ab
+md5sum = b7928d7b0a2b5e2888f5ddf68f5fe422
+[download-image-debian-11]
+<= download-image
+url = http://shacache.org/shacache/476c96feff4bc44950e8ccf05d703d973f6d60c5ab95c8724cc4096cb008b3f904708a2377c293bf73758914d2d4556a31a056b0f33cae11ed48194019fdab4c
+md5sum = e58dbfd8637d73f7ccd473ad16da852a
 [versions]
 erp5.util = 0.4.69
--- a/software/erp5testnode/testsuite/deploy-test/standalone-local-playbook
+++ b/software/erp5testnode/testsuite/deploy-test/standalone-local-playbook
@@ -1950,10 +1950,10 @@ function download_playbook {
    if [ ! -f /etc/opt/slapcache.cfg ]; then
      slapcache-conf
    fi
-    DFILE="/tmp/tmpplaybook$(basename $0).$$/"
+    DFILE=$(mktemp -d -t "$(basename "$0")"-XXXXXXXXXXXX)
    TFILE="archive.tar.gz"
    mkdir -p $DFILE
-    cd $DFILE
+    cd "$DFILE" || exit 1
    slapcache-download --destination=$TFILE
    tar -xzvf $TFILE
    rm $TFILE
@@ -2198,10 +2198,11 @@ if [ ! -f /etc/opt/slapcache.cfg ]; then
 fi
 sed -i "s/key = slapos-global-key/key = slapos-global-official-vifib-key/g" /etc/opt/slapcache.cfg 
-DFILE="/tmp/tmpplaybook_unstable$(basename $0).$$/"
+DFILE=$(mktemp -d -t "$(basename "$0")"-XXXXXXXXXXXX)
 TFILE="archive.tar.gz"
 mkdir -p $DFILE
-cd $DFILE
+cd "$DFILE" || exit 1
 wget -O $TFILE http://10.0.2.100/playbook.tar.gz
 tar -xzvf $TFILE
 rm $TFILE

--- a/software/kvm/README.rst
+++ b/software/kvm/README.rst
@@ -69,8 +69,6 @@ KVM instance parameters:
    MD5Sum of image disk to download
 - virtual-hard-drive-gzipped (default: False)
    Compress image to reduce size with gzip (.gz)
- hard-drive-url-check-certificate (default: True)
-    if virtual-hard-drive-url use self-signed https, then specify if https certificate should be verified or not
 - enable-http-server (default: False)
    Configure server that will help to get some files into the vm from http

--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -19,11 +19,11 @@ md5sum = a7978940fb9cdcc4e1ec33015ba640ba
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 150285957daa256420d2d73519277420
+md5sum = d790827b6199aa5aada5fe7acb8f1a7b
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = c00608f94ff6cfd8d37a280267c7227f
+md5sum = 4919254d85b98659c1be2ae631b99a13
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
@@ -55,7 +55,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b
 [template-kvm-run]
 filename = template/template-kvm-run.in
-md5sum = 7da4fcd815cb7abe318d8ac4b98c8cf3
+md5sum = fa048a28da7362d570f5b6bd1e05d232
 [template-kvm-controller]
 filename = template/kvm-controller-run.in
@@ -79,7 +79,7 @@ md5sum = 438192aab9f11e40dc521b46a4854dcf
 [image-download-controller]
 filename = template/image-download-controller.py.in
-md5sum = dc822ddd7dc987bf808a64a18ba11fd0
+md5sum = 9636903e683e4712e313ca2c470cfb94
 [image-download-config-creator]
 filename = template/image-download-config-creator.py.in

--- a/software/kvm/instance-kvm-cluster-input-schema.json
+++ b/software/kvm/instance-kvm-cluster-input-schema.json
@@ -386,12 +386,6 @@
              "type": "boolean",
              "default": false
            },
-            "hard-drive-url-check-certificate": {
-              "title": "Check certificate when downloading virtual hard drive from https.",
-              "description": "Define if certificate should be checked when downloading virtual hard drive from https url.",
-              "type": "boolean",
-              "default": true
-            },
            "wipe-disk-ondestroy": {
              "title": "Wipe disks when destroy the VM",
              "description": "Say if disks should be wiped by writing new data over every single bit before delete them. This option is used to securely delete VM disks",

--- a/software/kvm/instance-kvm-cluster.cfg.jinja2.in
+++ b/software/kvm/instance-kvm-cluster.cfg.jinja2.in
@@ -117,7 +117,6 @@ config-enable-vhost = {{ dumps(kvm_parameter_dict.get('enable-vhost', False)) }}
 {{ setconfig('virtual-hard-drive-url', kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
 {{ setconfig('virtual-hard-drive-md5sum', kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
 config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-gzipped', False)) }}
-config-hard-drive-url-check-certificate = {{ dumps(kvm_parameter_dict.get('hard-drive-url-check-certificate', True)) }}
 config-external-disk-number = {{ dumps(kvm_parameter_dict.get('external-disk-number', 0)) }}
 config-external-disk-size = {{ dumps(kvm_parameter_dict.get('external-disk-size', 20)) }}
 config-external-disk-format = {{ dumps(kvm_parameter_dict.get('external-disk-format', 'qcow2')) }}

--- a/software/kvm/instance-kvm-input-schema.json
+++ b/software/kvm/instance-kvm-input-schema.json
@@ -187,12 +187,6 @@
      "type": "boolean",
      "default": false
    },
-    "hard-drive-url-check-certificate": {
-      "title": "Check certificate when downloading virtual hard drive from https.",
-      "description": "Define if certificate should be checked when downloading virtual hard drive from https url.",
-      "type": "boolean",
-      "default": true
-    },
    "wipe-disk-ondestroy": {
      "title": "Wipe disks when destroy the VM",
      "description": "Say if disks should be wiped by writing new data over every single bit before delete them. This option is used to securely delete VM disks",

--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -457,7 +457,6 @@ enable-vhost = ${slap-parameter:enable-vhost}
 virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
 virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
 virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped}
-hard-drive-url-check-certificate = ${slap-parameter:hard-drive-url-check-certificate}
 shell-path = {{ dash_executable_location }}
 qemu-path =  {{ qemu_executable_location }}
@@ -1091,8 +1090,6 @@ enable-vhost = False
 virtual-hard-drive-url =
 virtual-hard-drive-md5sum =
 virtual-hard-drive-gzipped = False
-# if virtual-hard-drive-url use https, then specify if https certificate should be checked or not
-hard-drive-url-check-certificate = True
 external-disk-number = 0
 external-disk-size = 20

--- a/software/kvm/template/image-download-controller.py.in
+++ b/software/kvm/template/image-download-controller.py.in
@@ -95,7 +95,6 @@ if __name__ == "__main__":
    try:
      subprocess.check_output([
        curl,
-        '--insecure',  # allow any download
        '--location',  # follow redirects
        '--no-progress-meter',  # do not tell too much
        '--max-time', '14400',  # maximum time for download is 4 hours

--- a/software/kvm/template/template-kvm-run.in
+++ b/software/kvm/template/template-kvm-run.in
@@ -59,7 +59,6 @@ httpd_port = {{ parameter_dict.get("httpd-port") }}
 netcat_bin = '{{ parameter_dict.get("netcat-binary") }}'.strip()
 cluster_doc_host = '{{ parameter_dict.get("cluster-doc-host") }}'
 cluster_doc_port = {{ parameter_dict.get("cluster-doc-port") }}
-url_check_certificate = '{{ parameter_dict.get("hard-drive-url-check-certificate", "true") }}'.lower()
 auto_ballooning = '{{ parameter_dict.get("auto-ballooning") }}' in ('true', 'True', '1')
 vm_name = '{{ parameter_dict.get("name") }}'

--- a/software/kvm/test/test.py
+++ b/software/kvm/test/test.py
@@ -103,7 +103,6 @@ bootstrap_machine_param_dict = {
    "e1f67a7ef7b96",
    "virtual-hard-drive-md5sum": "9ffd690a5fcb4fa56702f2b99183e493",
    "virtual-hard-drive-gzipped": True,
-    "hard-drive-url-check-certificate": False,
    "use-tap": True,
    "use-nat": True,
    "nat-restrict-mode": True,

--- a/software/mca/dep--mca--static.cfg
+++ b/software/mca/dep--mca--static.cfg
@@ -30,6 +30,8 @@ location = /usr
 recipe  = plone.recipe.command
 command = ${:location}/bin/go env -w GOPATH=${buildout:directory}/go
 environment =
+environment-extra =
+stop-on-error = yes
 location = /usr
 [cmake]

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -31,6 +31,9 @@ extends =
  ../../component/apache-php/buildout.cfg
+[python]
+part = python3
 [template-download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -91,6 +91,7 @@ depends = ${slapos-cookbook-dependencies:eggs}
 [pyrsistent]
 recipe = zc.recipe.egg:custom
 egg = pyrsistent
+[pyrsistent:python2]
 setup-eggs = pytest-runner
 [slapos-cookbook-dependencies]
@@ -232,7 +233,7 @@ erp5.util = 0.4.74
 feedparser = 5.2.1
 functools32 = 3.2.3.post2
 attrs = 22.1.0
-pyrsistent = 0.16.1
+pyrsistent = 0.18.1
 pytest-runner = 5.2:whl
 ipaddress = 1.0.23
 jsonschema = 3.0.2:whl
@@ -265,6 +266,7 @@ requests = 2.27.1
 charset-normalizer = 2.0.12
 pyparsing = 2.2.0
 certifi = 2020.4.5.1
+pyrsistent = 0.16.1
 [versions:sys.version_info < (3,8)]
 MarkupSafe = 1.0