Commit 3f565f87 authored by Benjamin Blanc's avatar Benjamin Blanc

testnode: add link to git depos and branch in software.cfg (ScalabilityTest case)

parent 7c598c24
...@@ -244,11 +244,13 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)) ...@@ -244,11 +244,13 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
""" """
Install testsuite softwares Install testsuite softwares
""" """
self.log('prepareSlapOSForTestSuite')
# Define how many time this method can take # Define how many time this method can take
max_time = 3600*10*1.0 # 10 hours max_time = 3600*10*1.0 # 10 hours
interval_time = 60 interval_time = 60
start_time = time.time() start_time = time.time()
# Create a communicator with slapos # Create a communicator with slapos
self.log("creating SlapOs Master communicator...")
self.slapos_communicator = SlapOSMasterCommunicator.SlapOSMasterCommunicator( self.slapos_communicator = SlapOSMasterCommunicator.SlapOSMasterCommunicator(
self.cert_path, self.cert_path,
self.key_path, self.key_path,
......
...@@ -99,6 +99,27 @@ class Updater(object): ...@@ -99,6 +99,27 @@ class Updater(object):
def git_update_server_info(self): def git_update_server_info(self):
return self._git('update-server-info') return self._git('update-server-info')
def git_create_repository_link(self):
""" Create a link in depository to the ".git" directory.
ex:
for "../erp5/.git"
"../erp5/erp5.git"->"../erp5/.git" will be created.
"""
git_repository_path = os.path.join(self.getRepositoryPath(), '.git')
name = os.path.basename(os.path.normpath(self.getRepositoryPath()))
git_repository_link_path = os.path.join(self.getRepositoryPath(), '%s.git' %name)
self.log("checking link %s -> %s.."
%(git_repository_link_path,git_repository_path))
if ( not os.path.lexists(git_repository_link_path) and \
not os.path.exists(git_repository_link_path) ):
try:
os.symlink(git_repository_path, git_repository_link_path)
self.log("link: %s -> %s created"
%(git_repository_link_path,git_repository_path))
except:
self.log("Cannot create link from %s -> %s"
%(git_repository_link_path,git_repository_path))
def _git_find_rev(self, ref): def _git_find_rev(self, ref):
try: try:
return self._git_cache[ref] return self._git_cache[ref]
......
...@@ -166,16 +166,18 @@ extends = %(software_config_path)s ...@@ -166,16 +166,18 @@ extends = %(software_config_path)s
# <obfuscated_url> word is modified by in runner.prepareSlapOSForTestSuite() # <obfuscated_url> word is modified by in runner.prepareSlapOSForTestSuite()
profile_content_list.append(""" profile_content_list.append("""
[%(buildout_section_id)s] [%(buildout_section_id)s]
repository = <obfuscated_url>/%(buildout_section_id)s repository = <obfuscated_url>/%(buildout_section_id)s/%(buildout_section_id)s.git
""" % {'buildout_section_id': buildout_section_id}) branch = %(branch)s
""" % {'buildout_section_id': buildout_section_id,
'branch' : vcs_repository.get('branch','master')})
else: else:
profile_content_list.append(""" profile_content_list.append("""
[%(buildout_section_id)s] [%(buildout_section_id)s]
repository = %(repository_path)s repository = %(repository_path)s
branch = %(branch)s branch = %(branch)s
""" % {'buildout_section_id': buildout_section_id, """ % {'buildout_section_id': buildout_section_id,
'repository_path' : repository_path, 'repository_path' : repository_path,
'branch' : vcs_repository.get('branch','master')}) 'branch' : vcs_repository.get('branch','master')})
if not profile_path_count: if not profile_path_count:
raise ValueError(PROFILE_PATH_KEY + ' not defined') raise ValueError(PROFILE_PATH_KEY + ' not defined')
# Write file # Write file
...@@ -262,6 +264,7 @@ branch = %(branch)s ...@@ -262,6 +264,7 @@ branch = %(branch)s
process_manager=self.process_manager) process_manager=self.process_manager)
updater.checkout() updater.checkout()
updater.git_update_server_info() updater.git_update_server_info()
updater.git_create_repository_link()
node_test_suite.revision = test_result.revision node_test_suite.revision = test_result.revision
def _cleanupLog(self): def _cleanupLog(self):
......
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