Include JSON schema lint in SR test suite

Usually when we make change to SlapOS profiles, we only check the result of SR test and sometimes problems in the json schema are introduced and we only notice this when we check the result of `SLAPOS-EGG-TEST`.

This MR is about:
  - also running `slapos.cookbook` tests as part of `SLAPOS-SR-TEST`. This test in fact contain both "egg tests" for some recipes in nexedi/slapos repository and "lint test" for the formatting of json schemas for parameters (because this nexedi/slapos repository contain both some recipes and profiles).
  - fixing current problems with json schemas on master branch.

/reviewed-on !612

slapos/test/utils.py

@@ -40,15 +40,30 @@ def makeRecipe(recipe_class, options, name='test', slap_connection=None):
     buildout['slap-connection'] = slap_connection
 
   # are we in buildout folder ?
-  # the usual layout is
-  # ${buildout:directory}/parts/slapos-repository/slapos/test/utils.py , so try
-  # to find a buildout relative to this file.
-  buildout_cfg = os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'buildout.cfg')
+  # in SLAPOS-EGG-TEST the usual layout is
+  # ${buildout:directory}/parts/slapos-repository/slapos/test/utils.py in instance buildout, so try
+  # to find a buildout.cfg relative to this file.
+  # What can also happens is that this repository is used from software folder, this is the case in
+  # SLAPOS-SR-TEST. In this case, ${buildout:eggs} is not set in buildout.cfg and we can only assume
+  # it will be the standards eggs and develop-eggs folders.
+
+  # {BASE_DIRECTORY}/parts/slapos-repository/slapos/test/utils.py
+  base_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
+  buildout_cfg = os.path.join(base_directory, 'buildout.cfg')
+
   if os.path.exists(buildout_cfg):
     parser = ConfigParser()
     parser.readfp(open(buildout_cfg))
-    eggs_directory = parser.get('buildout', 'eggs-directory')
-    develop_eggs_directory = parser.get('buildout', 'develop-eggs-directory')
+    eggs_directory = parser.get(
+        'buildout',
+        'eggs-directory',
+        # default, for the case when buildout_cfg is a software buildout
+        # like with SLAPOS-SR-TEST.
+        vars={'eggs-directory': os.path.join(base_directory, 'eggs')})
+    develop_eggs_directory = parser.get(
+        'buildout',
+        'develop-eggs-directory',
+        vars={'develop-eggs-directory': os.path.join(base_directory, 'develop-eggs')})
     logging.getLogger(__name__).info(
         'Using eggs-directory (%s) and develop-eggs-directory (%s) from buildout at %s',
         eggs_directory,

software/slapos-sr-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 6e4bde9074cdc508df513e31653e7def
+md5sum = 81b01eb048e0db93bf0152504bf8a04d

software/slapos-sr-testing/instance.cfg

@@ -28,7 +28,7 @@ bin = $${buildout:directory}/bin
 working-dir = $${buildout:directory}/tmp
 
 [test-list]
-path_list = ${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.slapos-master-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup},${slapos.test.jupyter-setup:setup},${slapos.test.nextcloud-setup:setup}
+path_list = ${slapos.cookbook-setup:setup},${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.slapos-master-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup},${slapos.test.jupyter-setup:setup},${slapos.test.nextcloud-setup:setup}
 
 [slapos-test-runner]
 recipe = slapos.cookbook:wrapper

software/slapos-sr-testing/software.cfg

@@ -22,6 +22,11 @@ parts =
 [setup-develop-egg]
 recipe = zc.recipe.egg:develop
 
+[slapos.cookbook-setup]
+<= setup-develop-egg
+egg = slapos.cookbook
+setup = ${slapos-repository:location}/
+
 [slapos.test.caddy-frontend-setup]
 <= setup-develop-egg
 egg = slapos.test.caddy-frontend
@@ -102,6 +107,7 @@ eggs =
   ${bcrypt:egg}
   slapos.libnetworkcache
   slapos.core
+  ${slapos.cookbook-setup:egg}
   ${slapos.test.caddy-frontend-setup:egg}
   ${slapos.test.erp5-setup:egg}
   ${slapos.test.slapos-master-setup:egg}