Commit 7b27ed27 authored by Jérome Perrin's avatar Jérome Perrin

testnode: implement software link

parent aad6888e
...@@ -79,7 +79,7 @@ def main(*args): ...@@ -79,7 +79,7 @@ def main(*args):
'proxy_port', 'git_binary','zip_binary','node_quantity', 'proxy_port', 'git_binary','zip_binary','node_quantity',
'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url', 'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url',
'slapos_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port', 'slapos_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port',
'computer_id', 'server_url'): 'computer_id', 'server_url', 'software_link'):
CONFIG[key] = config.get('testnode',key) CONFIG[key] = config.get('testnode',key)
for key in ('slapos_directory', 'working_directory', 'test_suite_directory', for key in ('slapos_directory', 'working_directory', 'test_suite_directory',
......
...@@ -107,6 +107,7 @@ class TestNode(object): ...@@ -107,6 +107,7 @@ class TestNode(object):
def constructProfile(self, node_test_suite, test_type, use_relative_path=False): def constructProfile(self, node_test_suite, test_type, use_relative_path=False):
config = self.config config = self.config
software_link = config['software_link']
profile_content = '' profile_content = ''
assert len(node_test_suite.vcs_repository_list), "we must have at least one repository" assert len(node_test_suite.vcs_repository_list), "we must have at least one repository"
profile_path_count = 0 profile_path_count = 0
...@@ -133,9 +134,13 @@ class TestNode(object): ...@@ -133,9 +134,13 @@ class TestNode(object):
profile_content_list.append(""" profile_content_list.append("""
# Testnode generated buildout
[buildout] [buildout]
extends = %(software_config_path)s extends =
""" % {'software_config_path': software_config_path}) %(software_config_path)s
%(software_link)s
""" % locals())
# Construct sections # Construct sections
if not(buildout_section_id is None): if not(buildout_section_id is None):
......
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