slaprunner : is now deployed by buildout

instead of a recipe

slapos/recipe/slaprunner/__init__.py

@@ -76,9 +76,9 @@ class Recipe(GenericBaseRecipe):
         cloud9_url=self.cloud9_url
     )
 
-    #config_file = self.createFile(self.options['slapos.cfg'],
-    #    self.substituteTemplate(self.getTemplateFilename('slapos.cfg.in'),
-    #    configuration))
+    config_file = self.createFile(self.options['slapos.cfg'],
+        self.substituteTemplate(self.getTemplateFilename('slapos.cfg.in'),
+        configuration))
     config_file = configuration['etc_dir'] + 'slapos.cfg'
 
     environment = dict(

software/slaprunner/common.cfg

@@ -81,14 +81,14 @@ command =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
-#md5sum = 92a2f3bcd5ff79e3b61ca4a8bacb73ec
+md5sum = 488af385149e4ead6f93d411cda93475
 mode = 0644
 
 [template-runner]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = 57b819ac075ac1114313f0461a7d2ae7
+md5sum = 646415d5e17cd46aa1362e01d76bdff5
 mode = 0644
 
 [instance-runner-import]
@@ -115,7 +115,7 @@ mode = 0644
 [template-resilient-test]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
-md5sum = ac772d3a1cce4072acfabd563df449bb
+md5sum = bb7ec7c44bc38b903092307e9751f917
 filename = instance-resilient-test.cfg.jinja2
 mode = 0644
 
@@ -137,7 +137,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [slapos-cfg-template]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-#md5sum =
+md5sum = 93f674a0c0d88b6d06d44b46b3643baf
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in.j2 
 download-only = true
@@ -159,6 +159,7 @@ eggs =
   slapos.core
   xml_marshaller
   pytz
+<<<<<<< HEAD
 
 # Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache
 [slapos-cookbook]
@@ -177,3 +178,6 @@ eggs =
   pytz
   slapos.libnetworkcache
 
+=======
+  collective.recipe.environment
+>>>>>>> 3bf4e1a... slaprunner : is now deployed by buildout

software/slaprunner/instance-runner.cfg

@@ -6,7 +6,6 @@ parts =
   certificate-authority
   ca-nginx
   ca-node-frontend
-  slaprunner
   test-runner
   sshkeys-dropbear-runner
   dropbear-server-add-authorized-key
@@ -21,7 +20,9 @@ parts =
   request-cloud9-frontend
   node-frontend-promise
   nginx-promise
+  environ
   slapos-cfg
+  slaprunner-wrapper
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -80,7 +81,6 @@ node-binary = ${nodejs:location}/bin/node
 cloud9 = ${cloud9:executable}
 
 [slaprunner]
-recipe = slapos.cookbook:slaprunner
 slaprunner = ${buildout:directory}/bin/slaprunner
 slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
 slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
@@ -106,6 +106,7 @@ partition-amount = $${slap-parameter:instance-amount}
 cloud9-url = $${cloud9:access-url}
 wrapper = $${directory:services}/slaprunner
 debug = $${slap-parameter:debug}
+access-url = https://[$${:ipv6}]:$${:runner_port} 
 
 [test-runner]
 <= slaprunner
@@ -426,3 +427,14 @@ context =
   key cloud9_url slaprunner:cloud9-url
   key run_dir slaprunner:run_dir
   key log_dir slaprunner:log_dir
+
+[environ]
+recipe = collective.recipe.environment
+
+[slaprunner-wrapper]
+recipe = slapos.cookbook:wrapper
+command-line = $${slaprunner:slaprunner} $${slaprunner:slapos.cfg} --log_file $${:log-file}
+log-file = $${slaprunner:log_dir}/slaprunner.log
+wrapper-path = $${slaprunner:wrapper}
+environment = PATH=$${slaprunner:git-binary}:$${environ:PATH}
+  GIT_SSH=$${slaprunner:ssh_client}

software/slaprunner/software.cfg

@@ -75,6 +75,7 @@ cliff = 1.4
 cmd2 = 0.6.6
 prettytable = 0.7.2
 requests = 1.2.3
+collective.recipe.environment = 0.2.0
 # Required by:
 # slapos.core==0.34
 # slapos.toolbox==0.34.0