Commit 760df98a authored by Nicolas Wavrant's avatar Nicolas Wavrant Committed by Cédric Le Ninivin

slaprunner: do not use slaprunner.test recipe anymore

parent aea2c7e4
......@@ -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 = 35244440c627151428210ab2645df556
mode = 0644
[instance-runner-import]
......
......@@ -7,7 +7,6 @@ parts =
ca-shellinabox
gunicorn-launcher
gunicorn-graceful
test-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
sshkeys-authority
......@@ -19,6 +18,7 @@ parts =
symlinks
shellinabox
slapos-cfg
slapos-test-cfg
slapos-repo-config
cron-entry-prepare-software
deploy-instance-parameters
......@@ -176,7 +176,6 @@ 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}
......@@ -187,7 +186,6 @@ proxy_port = 8602
wrapper = $${directory:bin}/runTestSuite
etc_dir = $${directory:test}
# Deploy dropbear (minimalist SSH server)
[sshkeys-directory]
recipe = slapos.cookbook:mkdirectory
......@@ -485,6 +483,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 = $${slaprunner:slapos.cfg}
mode = 700
context =
section slaprunner test-runner
[shellinabox]
recipe = slapos.cookbook:shellinabox
ipv6 = $${slap-network-information:global-ipv6}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment