Provide and use run_directory instead of computing it.

slapos/recipe/erp5testnode/__init__.py

@@ -92,6 +92,7 @@ class Recipe(BaseSlapRecipe):
               test_node_title=self.parameter_dict.get('test_node_title'),
               project_title=self.parameter_dict.get('project_title'),
               bin_directory=self.bin_directory,
+              run_directory=self.run_directory,
               # botenvironemnt is splittable string of key=value to substitute
               # environment of running bot
               bot_environment=self.parameter_dict.get('bot_environment', ''),

slapos/recipe/erp5testnode/testnode.py

@@ -84,8 +84,8 @@ PROFILE_PATH_KEY = 'profile_path'
 def run(args):
   config = args[0]
   slapgrid = None
-  supervisord_pid_file = os.path.join(config['instance_root'], 'var', 'run',
-        'supervisord.pid')
+  supervisord_pid_file = os.path.join(config['run_directory'],
+    'supervisord.pid')
   subprocess.check_call([config['git_binary'],
                 "config", "--global", "http.sslVerify", "false"])
   previous_revision = None