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 = 35244440c627151428210ab2645df556
+md5sum = 569fc375fdf28c2ca8d40be9d6a4814c
 mode = 0644
 
 [instance-runner-import]

software/slaprunner/instance-runner.cfg

@@ -14,11 +14,11 @@ parts =
   slaprunner-promise
   slaprunner-frontend-promise
   dropbear-promise
+  runtestsuite
   shellinabox-promise
   symlinks
   shellinabox
   slapos-cfg
-  slapos-test-cfg
   slapos-repo-config
   cron-entry-prepare-software
   deploy-instance-parameters
@@ -176,16 +176,20 @@ knowledge0_file = $${buildout:directory}/$${public:filename}
 
 [test-runner]
 <= slaprunner
-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]
 recipe = slapos.cookbook:mkdirectory
@@ -486,7 +490,7 @@ context =
 [slapos-test-cfg]
 recipe = slapos.recipe.template:jinja2
 template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
-rendered = $${slaprunner:slapos.cfg}
+rendered = $${test-runner:slapos.cfg}
 mode = 700
 context =
   section slaprunner test-runner