Add var/run dir and update slaprunner-test config

slapos/recipe/slaprunner/__init__.py

@@ -60,6 +60,8 @@ class Recipe(GenericBaseRecipe):
           'supervisord.conf'),
         runner_workdir=self.workdir,
         etc_dir=self.options['etc_dir'],
+        run_dir=self.options['run_dir'],
+        log_dir=self.options['log_dir'],
         runner_host=self.ipv6,
         runner_port=self.runner_port,
         ipv4_address=self.ipv4,
@@ -128,6 +130,8 @@ class Test(GenericBaseRecipe):
           'supervisord.conf'),
         runner_workdir=self.workdir,
         etc_dir=self.options['etc_dir'],
+        run_dir=self.options['etc_dir'],
+        log_dir=self.workdir,
         runner_host=self.ipv6,
         runner_port=self.runner_port,
         ipv4_address=self.ipv4,

slapos/recipe/slaprunner/template/slapos.cfg.in

@@ -20,6 +20,8 @@ runner_port = %(runner_port)s
 ipv4_address = %(ipv4_address)s
 ipv6_address = %(ipv6_address)s
 etc_dir = %(etc_dir)s
+run_dir = %(run_dir)s
+log_dir = %(log_dir)s
 
 [slapproxy]
 host = %(proxy_host)s

software/slaprunner/instance-runner.cfg

@@ -84,6 +84,7 @@ software-directory = $${runnerdirectory:software-root}
 instance-directory = $${runnerdirectory:instance-root}
 etc_dir = $${rootdirectory:etc}
 log_dir =  $${basedirectory:log}
+run_dir = $${basedirectory:run}
 ssh_client = $${sshkeys-dropbear:wrapper}
 public_key = $${sshkeys-dropbear:public-key}
 private_key = $${sshkeys-dropbear:private-key}
@@ -94,7 +95,7 @@ runner_port = 50000
 partition-amount = $${slap-parameter:instance-amount}
 cloud9-url = $${cloud9:access-url}
 wrapper = $${basedirectory:services}/slaprunner
-debug = False
+debug = $${slap-parameter:debug}
 
 # Deploy dropbear (minimalist ssh server)
 [sshkeys-directory]
@@ -111,6 +112,7 @@ working-directory = $${runnerdirectory:test}
 project-directory = $${runnerdirectory:project-test}
 software-directory = $${runnerdirectory:software-test}
 instance-directory = $${runnerdirectory:instance-test}
+proxy_port = 8602
 wrapper = $${rootdirectory:bin}/runTestSuite
 etc_dir = $${basedirectory:test}
 
@@ -203,3 +205,4 @@ port = $${dropbear-server:port}
 authorized-key =
 # Default value of instances number in slaprunner
 instance-amount = 10
+debug = false

software/slaprunner/software.cfg

@@ -25,7 +25,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = bd1c73c149b4adf2fbab80bc29c782c8
+md5sum = 00a4dd27dc699c1cd3ec57282d779070
 mode = 0644
 
 [eggs]
@@ -57,102 +57,3 @@ signature-certificate-list =
 # Forced stable version of lxml - 3.0 alpha keeps appearing/diseappearing on
 # Pypi
 lxml = 2.3.6
-
-Flask-Auth = 0.8
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-apache-libcloud = 0.11.3
-async = 0.6.1
-buildout-versions = 1.7
-gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.6
-meld3 = 0.6.9
-plone.recipe.command = 1.1
-pycrypto = 2.6
-slapos.cookbook = 0.68.1
-slapos.libnetworkcache = 0.13.2
-slapos.recipe.build = 0.11.5
-slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.31.1
-smmap = 0.8.2
-z3c.recipe.scripts = 1.0.1
-
-# Required by:
-# slapos.core==0.31.2
-# slapos.toolbox==0.31.1
-Flask = 0.9
-
-# Required by:
-# slapos.toolbox==0.31.1
-GitPython = 0.3.2.RC1
-
-# Required by:
-# slapos.cookbook==0.68
-PyXML = 0.8.4
-
-# Required by:
-# slapos.toolbox==0.31.1
-atomize = 0.1.1
-
-# Required by:
-# slapos.toolbox==0.31.1
-feedparser = 5.1.2
-
-# Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
-
-# Required by:
-# slapos.cookbook==0.68
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.68
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.31.2
-netifaces = 0.8
-
-# Required by:
-# slapos.toolbox==0.31.1
-paramiko = 1.7.7.2
-
-# Required by:
-# slapos.toolbox==0.31.1
-psutil = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.68
-pytz = 2012f
-
-# Required by:
-# slapos.cookbook==0.68
-# slapos.core==0.31.2
-# slapos.libnetworkcache==0.13.2
-# slapos.toolbox==0.31.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-007
-# zc.recipe.egg==1.3.2
-# zope.interface==4.0.1
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.68
-slapos.core = 0.31.2
-
-# Required by:
-# slapos.core==0.31.2
-supervisor = 3.0b1
-
-# Required by:
-# slapos.cookbook==0.68
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.68
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.31.2
-zope.interface = 4.0.1