version up slapos.toolbox 0.110

Since this version introduces a dependency on backports.lzma we had to
explicitly install backports.lzma in a slapos compliant way before installing
slapos.toolbox, because installing the egg needs xz-utils.

For slapos-sr-testing it's also a version up of backports.lzma to 0.14.0

software/slapos-sr-testing/software.cfg

@@ -175,6 +175,7 @@ eggs =
   ${python-pynacl:egg}
   ${python-cryptography:egg}
   ${python-mysqlclient:egg}
+  ${backports.lzma:egg}
   ${bcrypt:egg}
   slapos.libnetworkcache
   supervisor
@@ -201,7 +202,6 @@ eggs =
   ${slapos.test.dream-setup:egg}
   ${slapos.test.metabase-setup:egg}
   ${slapos.test.repman-setup:egg}
-  ${backports.lzma:egg}
 entry-points =
   runTestSuite=erp5.util.testsuite:runTestSuite
 scripts =
@@ -311,8 +311,6 @@ Django = 1.11
 # selenium==3.141.0
 urllib3 = 1.24.1
 
-backports.lzma = 0.0.13
-
 mock = 2.0.0
 testfixtures = 6.11
 funcsigs = 1.0.2

software/slapos-testing/software.cfg

@@ -83,8 +83,7 @@ setup = ${slapos.recipe.template-repository:location}
 
 [slapos.toolbox-setup]
 <= setup-develop-egg
-# XXX slapos.toolbox does not have `test` extra require, `mock` and `pycurl` are only listed in `tests_require` and are listed explicitly
-egg = slapos.toolbox
+egg = slapos.toolbox[test]
 setup = ${slapos.toolbox-repository:location}
 depends = ${slapos.core-setup:egg}
 
@@ -98,6 +97,7 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   ${python-cryptography:egg}
+  ${backports.lzma:egg}
   ${pycurl:egg}
   ${bcrypt:egg}
   dnspython
@@ -113,7 +113,6 @@ eggs =
   ${slapos.toolbox-setup:egg}
   ${slapos.libnetworkcache-setup:egg}
   ${slapos.rebootstrap-setup:egg}
-  mock
   zope.testing
   supervisor
 entry-points =

stack/erp5/buildout.cfg

@@ -562,11 +562,7 @@ setup = ${erp5:location}
 [zodbpack]
 recipe = zc.recipe.egg
 eggs =
-  ${lxml-python:egg}
-  ${pycurl:egg}
-  ${python-PyYAML:egg}
-  ${python-cryptography:egg}
-  ${python-cliff:egg}
+  ${slapos-toolbox:dependencies}
   slapos.toolbox[zodbpack]
 scripts =
   zodbpack

stack/lamp/buildout.cfg

@@ -31,6 +31,7 @@ extends =
   ../../component/perl/buildout.cfg
   ../../component/sqlite3/buildout.cfg
   ../../component/stunnel/buildout.cfg
+  ../../component/xz-utils/buildout.cfg
   ../../component/zlib/buildout.cfg
   ../erp5/buildout.cfg
   ../logrotate/buildout.cfg
@@ -88,6 +89,7 @@ context =
     key logrotate_location logrotate:location
     key logrotate_cfg template-logrotate-base:rendered
     key gzip_location gzip:location
+    key xz_utils_location xz-utils:location
     key stunnel_location stunnel:location
     key template_monitor monitor2-template:rendered
     key mariadb_link_binary template-mariadb:link-binary
@@ -137,6 +139,4 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [eggs]
 recipe = zc.recipe.egg
 eggs =
-  ${lxml-python:egg}
-  ${pycurl:egg}
-  slapos.toolbox
+  ${slapos-toolbox:eggs}

stack/lamp/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance]
 filename = instance.cfg.in
-md5sum = be63b936ed521edaead8e0770ac64621
+md5sum = 5c953c0f5d3376718eb9c4030288647a
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in

stack/lamp/instance.cfg.in

@@ -78,6 +78,7 @@ coreutils-location = {{ coreutils_location }}
 dash-location = {{ dash_location }}
 findutils-location = {{ findutils_location }}
 gzip-location = {{ gzip_location }}
+xz-utils-location = {{ xz_utils_location }}
 mariadb-location = {{ mariadb_location }}
 template-my-cnf = {{ template_my_cnf }}
 template-mariadb-initial-setup = {{ template_mariadb_initial_setup }}

stack/slapos.cfg

@@ -23,6 +23,7 @@ extends =
   ../component/defaults.cfg
   ../component/git/buildout.cfg
   ../component/lxml-python/buildout.cfg
+  ../component/python-backports-lzma/buildout.cfg
   ../component/python-cffi/buildout.cfg
   ../component/python-cliff/buildout.cfg
   ../component/python-cachecontrol/buildout.cfg
@@ -103,10 +104,13 @@ eggs =
 [slapos-toolbox]
 recipe = zc.recipe.egg
 eggs =
+  ${:dependencies}
+  slapos.toolbox
+dependencies =
   ${lxml-python:egg}
   ${pycurl:egg}
   ${python-cryptography:egg}
-  slapos.toolbox
+  ${backports.lzma:egg}
 
 [jsonschema]
 recipe = zc.recipe.egg:custom
@@ -135,6 +139,7 @@ MarkupSafe = 1.0
 PyYAML = 3.13
 Werkzeug = 0.12
 asn1crypto = 1.3.0
+backports.lzma = 0.0.14
 cffi = 1.14.0
 click = 6.7
 cliff = 2.4.0
@@ -167,7 +172,7 @@ slapos.libnetworkcache = 0.20
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.45
 slapos.recipe.cmmi = 0.16
-slapos.toolbox = 0.109
+slapos.toolbox = 0.110
 stevedore = 1.21.0
 subprocess32 = 3.5.3
 unicodecsv = 0.14.1

[Jérome Perrin]

this cause regression on SlapOS.SlapRunner.ResilienceTest-Master.* test suites, I'm checking this