slaprunner: do not use slaprunner.test recipe anymore

slaprunner: bin/runTestSuite created with buildout

software/slaprunner/common.cfg

@@ -44,7 +44,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 2bf878b9e658cfb59b44ad1ee107e4d4
+md5sum = 569fc375fdf28c2ca8d40be9d6a4814c
 mode = 0644
 
 [instance-runner-import]

software/slaprunner/instance-runner.cfg

@@ -7,7 +7,6 @@ parts =
   ca-shellinabox
   gunicorn-launcher
   gunicorn-graceful
-  test-runner
   sshkeys-dropbear-runner
   dropbear-server-add-authorized-key
   sshkeys-authority
@@ -15,6 +14,7 @@ parts =
   slaprunner-promise
   slaprunner-frontend-promise
   dropbear-promise
+  runtestsuite
   shellinabox-promise
   symlinks
   shellinabox
@@ -176,17 +176,19 @@ knowledge0_file = $${buildout:directory}/$${public:filename}
 
 [test-runner]
 <= slaprunner
-recipe = slapos.cookbook:slaprunner.test
-slaprunnertest = ${buildout:directory}/bin/slaprunnertest
 slapos.cfg = $${directory:etc}/slapos-test.cfg
 working-directory = $${runnerdirectory:test}
 project-directory = $${runnerdirectory:project-test}
 software-directory = $${runnerdirectory:software-test}
 instance-directory = $${runnerdirectory:instance-test}
 proxy_port = 8602
-wrapper = $${directory:bin}/runTestSuite
 etc_dir = $${directory:test}
 
+[runtestsuite]
+recipe = slapos.cookbook:wrapper
+command-line = ${buildout:directory}/bin/slaprunnertest
+wrapper-path = $${directory:bin}/runTestSuite
+environment = RUNNER_CONFIG=$${slapos-test-cfg:rendered}
 
 # Deploy dropbear (minimalist SSH server)
 [sshkeys-directory]
@@ -485,6 +487,14 @@ mode = 700
 context =
   section slaprunner slaprunner
 
+[slapos-test-cfg]
+recipe = slapos.recipe.template:jinja2
+template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
+rendered = $${test-runner:slapos.cfg}
+mode = 700
+context =
+  section slaprunner test-runner
+
 [shellinabox]
 recipe = slapos.cookbook:shellinabox
 ipv6 = $${slap-network-information:global-ipv6}