From d11fcee17d7ab141bedd01190fa8a914ff880efc Mon Sep 17 00:00:00 2001 From: Nicolas Wavrant <nicolas.wavrant@tiolive.com> Date: Wed, 16 Oct 2013 14:23:20 +0200 Subject: [PATCH] slaprunner: new wrapper to start isSoftwareReleaseReady new function --- software/slaprunner/instance-runner.cfg | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index 3540397d0..cdf2811da 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -27,6 +27,7 @@ parts = slapos-cfg slaprunner-wrapper slapos-repo-config + prepare-software eggs-directory = ${buildout:eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory} @@ -500,4 +501,10 @@ stop-on-error = true reference = $${slap-parameter:slapos-reference} location = $${slapos-repo:location} environment = export PATH=${git:location}/bin:$PATH; -command = $${:environment} (cd $${:location} && git checkout $${:reference} && SR=$${slap-parameter:slapos-software} && if [ -n "$SR" ]; then echo workspace/$${slap-parameter:slapos-software} > $${directory:etc}/.project; fi) +command = $${:environment} (cd $${:location} && git checkout $${:reference} && SR=$${slap-parameter:slapos-software} && if [ -n "$SR" ]; then echo workspace/slapos/$${slap-parameter:slapos-software}/ > $${directory:etc}/.project; fi) + +[prepare-software] +recipe = slapos.cookbook:wrapper +command-line = ${curl:location}/bin/curl $${slaprunner:ipv4}:$${slaprunner:runner_port}/isSRReady --max-time 1 +wrapper-path = $${directory:scripts}/prepareSoftware + -- 2.30.9