wip: extra

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

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = ee121b559c203d386bd56e8d9f8599b3
+md5sum = b21b2a9ac7f027a044a897c6eacbba56

software/slapos-sr-testing/instance.cfg

@@ -2,45 +2,41 @@
 parts =
   slapos-test-runner
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ buildout['eggs-directory'] }}
+develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
 offline = true
 
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
 
 [download-source]
 recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
+git-executable = {{ git_location }}/bin/git
 
 [slapos]
 <= download-source
-repository = ${slapos-repository:location}
+repository = {{ slapos_location }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-bin = $${buildout:directory}/bin
-working-dir = $${buildout:directory}/tmp
-
-[test-list]
-extra_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.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.helloworld-setup:setup},${slapos.test.jupyter-setup:setup},${slapos.test.nextcloud-setup:setup},${slapos.test.turnserver-setup:setup},${slapos.test.theia-setup:setup},${slapos.test.grafana-setup:setup}
-path_list = ${slapos.test.kvm-setup:setup},${slapos.test.slaprunner-setup:setup},$${:extra_path_list}
+bin = ${buildout:directory}/bin
+working-dir = ${buildout:directory}/tmp
 
 [slapos-test-runner]
 recipe = slapos.cookbook:wrapper
-wrapper-path = $${directory:bin}/runTestSuite
+wrapper-path = ${directory:bin}/runTestSuite
 command-line =
-  ${buildout:bin-directory}/runTestSuite
-  --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
-  --source_code_path_list=$${test-list:path_list}
+  {{ buildout['bin-directory'] }}/runTestSuite
+  --python_interpreter={{ buildout['bin-directory'] }}/{{ interpreter }}
+  --source_code_path_list={{ ','.join(tests.splitlines()) }}
 
 environment =
-  PATH=${buildout:bin-directory}:${quic_client-bin:location}:${curl:location}/bin/:/usr/bin/:/bin
-  SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
-  SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
-  SLAPOS_TEST_WORKING_DIR=$${directory:working-dir}
+  PATH={{ buildout['bin-directory'] }}:{{ quic_client_location }}:{{ curl_location }}/bin/:/usr/bin/:/bin
+  SLAPOS_TEST_IPV4=${slap-configuration:ipv4-random}
+  SLAPOS_TEST_IPV6=${slap-configuration:ipv6-random}
+  SLAPOS_TEST_WORKING_DIR=${directory:working-dir}

software/slapos-sr-testing/software-py3.cfg

@@ -3,5 +3,5 @@
 extends =
   software.cfg
 
-[test-list]
-extra_path_list =
+[template]
+extra =

software/slapos-sr-testing/software.cfg

@@ -171,10 +171,41 @@ repository = https://lab.nexedi.com/nexedi/slapos.git
 branch = master
 
 [template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/template.cfg
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}
+rendered = ${buildout:directory}/template.cfg
 mode = 640
+context =
+  section buildout buildout
+  key git_location git:location
+  key slapos_location slapos-repository:location
+  key interpreter eggs:interpreter
+  key quic_client_location quic_client-bin:location
+  key curl_location curl:location
+  key tests :tests
+# common repos
+tests =
+  ${slapos.test.kvm-setup:setup}
+  ${slapos.test.slaprunner-setup:setup}
+  ${:extra}
+# py2-only repos
+extra =
+  ${slapos.cookbook-setup:setup}
+  ${slapos.test.caddy-frontend-setup:setup}
+  ${slapos.test.erp5-setup:setup}
+  ${slapos.test.slapos-master-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.helloworld-setup:setup}
+  ${slapos.test.jupyter-setup:setup}
+  ${slapos.test.nextcloud-setup:setup}
+  ${slapos.test.turnserver-setup:setup}
+  ${slapos.test.theia-setup:setup}
+  ${slapos.test.grafana-setup:setup}
 
 [versions]
 # slapos.core is used from the clone always