From 3ad885f79d1fa26a5b4b30791c0009540009c1d2 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Wed, 18 Oct 2017 00:59:13 +0200 Subject: [PATCH] fixup! slaprunner: runTestSuite should use PATH from environment. Environment requires new lines instead spaces --- software/slaprunner/buildout.hash.cfg | 2 +- software/slaprunner/instance-runner.cfg | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg index cd4c3ef8d..9145db2e3 100644 --- a/software/slaprunner/buildout.hash.cfg +++ b/software/slaprunner/buildout.hash.cfg @@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab [template-runner] filename = instance-runner.cfg -md5sum = 6a354f667a2355b905a660d19871d99e +md5sum = baf70a9f2f433ea0f2f5139700e53b1f [template-runner-import-script] filename = template/runner-import.sh.jinja2 diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index fa6d261d1..827ab24b9 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -201,7 +201,8 @@ recipe = slapos.cookbook:wrapper arguments = --server_url=$${slap-connection:server-url} --key_file=$${slap-connection:key-file} --cert_file=$${slap-connection:cert-file} --computer_id=$${slap-connection:computer-id} --partition_id=$${slap-connection:partition-id} command-line = ${buildout:directory}/bin/slaprunnertest $${:arguments} wrapper-path = $${directory:bin}/runTestSuite -environment = RUNNER_CONFIG=$${slapos-cfg:rendered} PATH=$${shell-environment:path} +environment = PATH=$${shell-environment:path} + RUNNER_CONFIG=$${slapos-cfg:rendered} parameters-extra = true # Deploy openssh-server -- 2.30.9