Merge branch 'master' into x/lte-multiru

* master:
  format-json, test: Don't force ASCII
  software/nayuos: fix instantiation
  component/haproxy: Version up
  Add needed python module for Beremiz / OSIE coupler integration tests.

component/haproxy/buildout.cfg

@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz
-md5sum = ecac9724e3ca6368624fb2fab29dd366
+url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.16.tar.gz
+md5sum = b01e605cdaf2742fcedf214a61e187b4
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

software/end-to-end-testing/software.cfg

@@ -29,6 +29,8 @@ eggs =
   slapos.core
   websocket-client
   requests
+  opcua
 
 [versions]
 websocket-client = 1.4.2
+opcua = 0.98.13

software/nayuos/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [template-instance]
 filename = instance.cfg
-md5sum = 7a558c2b9461ec588c9d77bdeef64e4d
+md5sum = 5a765463118f8b2a09df6260f56c2175

software/nayuos/instance.cfg

@@ -25,7 +25,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 # needed for the "repo" command (to download many git repositories)
 recipe = slapos.recipe.build:gitclone
 repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
-branch = master
+branch = main
 git-executable = {{ git_path }}/bin/git
 
 [customize-path]