Merge remote-tracking branch 'upstream/master' into zope4py2

component/fluentbit-plugin-wendelin/buildout.cfg

+# This is part of the OCEAN project.
+# Plugin for fluent-bit to send data to Wendelin:
+# https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin
+
+[buildout]
+extends =
+  ../golang/buildout.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+
+[fluentbit-plugin-wendelin]
+recipe = slapos.recipe.cmmi
+share = true
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.1i-dev_buildout/fluentbit-plugin-wendelin-v0.1i-dev_buildout.tar.gz
+md5sum = 9ed2ef46b0edfca072255b849ee65249
+configure-command = echo "No configure command."
+environment =
+  PATH=${golang1.17:location}/bin:%(PATH)s
+  PREFIX=@@LOCATION@@

component/mca/buildout.cfg

+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+
+[buildout]
+extends =
+  ../../component/defaults.cfg
+  ../../component/fmtlib/buildout.cfg
+  ../../component/openssl/buildout.cfg
+
+parts =
+  mca
+
+[mca]
+recipe = slapos.recipe.cmmi
+url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.2h-dev_buildout/metadata-collect-agent-v0.2h-dev_buildout.tar.gz
+md5sum = f394ea9507d13a0b18f9485e70abaf32
+configure-command = :
+make-targets =
+  no-dracut
+  install-no-dracut
+environment =
+  PYTHON_PATH=${python3:location}
+  PREFIX=@@LOCATION@@
+  OPENSSL_PATH=${openssl:location}
+  FMTLIB_PATH=${fmtlib:location}

software/erp5testnode/testsuite/deploy-test/software.cfg

 [buildout]
 extends =
   buildout.hash.cfg
-  https://lab.nexedi.com/nexedi/slapos/raw/1.0.232/software/kvm/software.cfg
+  https://lab.nexedi.com/nexedi/slapos/raw/1.0.264/software/kvm/software.cfg
 parts =
   python-with-eggs
   template-deploy-test

software/mca/dep--mca--static.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# "dep--" means it does not compile all the building dependencies
+# "--static" indicates that it is the statically linked version of it
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  mca--static.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[golang1.17]
+recipe  = plone.recipe.command
+command = ${:location}/bin/go env -w GOPATH=${buildout:directory}/go
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

software/mca/dep--mca.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# "dep--" means it does not compile all the building dependencies
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  software.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[golang1.17]
+recipe  = plone.recipe.command
+command = ${:location}/bin/go env -w GOPATH=${buildout:directory}/go
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

software/mca/mca--static.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+# "--static" indicates that it is the statically linked version of it
+
+[buildout]
+extends =
+  software.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+
+# ENABLE STATIC LINKING
+# note: as a general matter, one has to tweak each dependency by hand to get a static executable
+[mca]
+# static version:
+# WARNING: LINK_STATIC only has to be defined to switch to static linking (so it does so even if the value is "NO", "OFF" or "FALSE"). Just don't define it in order to deactivate the option.
+environment +=
+  ZLIB_PATH=${zlib:location}
+  LINK_STATIC=dumb_value
+
+[fmtlib]
+# static version:
+shared = false
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DFMT_TEST=OFF
+  -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE

software/mca/software.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+
+[buildout]
+extends =
+  ../../component/fluentbit-plugin-wendelin/buildout.cfg
+  ../../component/mca/buildout.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+[golang1.17]
+# Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM.
+# A less radical way to fix the issue may be investigated in the future.
+make-targets = cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
+post-install =
+  ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
+# This line relocates the golang cached modules directory so that the modules are sent to OBS along with the code to compile.
+  ${:location}/bin/go env -w GOPATH=${buildout:directory}/go