Commit 4a438d91 authored by Gabriel Monnerat's avatar Gabriel Monnerat

add argument in testnode section to be possible pass the list of bt5(as...

add argument in testnode section to be possible pass the list of bt5(as string) that will be used by runUnitTest.
parent 33b9774d
...@@ -64,7 +64,17 @@ class Recipe(BaseSlapRecipe): ...@@ -64,7 +64,17 @@ class Recipe(BaseSlapRecipe):
CONFIG['slapproxy_binary'] = self.options['slapproxy_binary'] CONFIG['slapproxy_binary'] = self.options['slapproxy_binary']
CONFIG['zip_binary'] = self.options['zip_binary'] CONFIG['zip_binary'] = self.options['zip_binary']
CONFIG['PATH'] = os.environ['PATH'] CONFIG['PATH'] = os.environ['PATH']
additional_bt5_repository_id = \
self.parameter_dict.get('additional_bt5_repository_id')
CONFIG['bt5_path'] = None
if additional_bt5_repository_id is not None:
CONFIG['bt5_path'] = ""
additional_bt5_repository_id_list = additional_bt5_repository_id.split(",")
for id in additional_bt5_repository_id_list:
id_path = os.path.join(CONFIG['slapos_directory'], id)
bt_path = os.path.join(id_path, "bt5")
CONFIG['bt5_path'] += "%s,%s," % (id_path, bt_path)
CONFIG['instance_dict'] = '' CONFIG['instance_dict'] = ''
if 'instance_dict' in self.parameter_dict: if 'instance_dict' in self.parameter_dict:
CONFIG['instance_dict'] = '[instance_dict]\n' CONFIG['instance_dict'] = '[instance_dict]\n'
......
...@@ -14,6 +14,7 @@ project_title= %(project_title)s ...@@ -14,6 +14,7 @@ project_title= %(project_title)s
ipv4_address = %(ipv4_address)s ipv4_address = %(ipv4_address)s
ipv6_address = %(ipv6_address)s ipv6_address = %(ipv6_address)s
test_suite_master_url = %(test_suite_master_url)s test_suite_master_url = %(test_suite_master_url)s
bt5_path = %(bt5_path)s
# Binaries # Binaries
git_binary = %(git_binary)s git_binary = %(git_binary)s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment