Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
erp5
Commits
3f565f87
Commit
3f565f87
authored
Aug 28, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: add link to git depos and branch in software.cfg (ScalabilityTest case)
parent
7c598c24
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
5 deletions
+31
-5
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+2
-0
erp5/util/testnode/Updater.py
erp5/util/testnode/Updater.py
+21
-0
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+8
-5
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
3f565f87
...
...
@@ -244,11 +244,13 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
"""
Install testsuite softwares
"""
self
.
log
(
'prepareSlapOSForTestSuite'
)
# Define how many time this method can take
max_time
=
3600
*
10
*
1.0
# 10 hours
interval_time
=
60
start_time
=
time
.
time
()
# Create a communicator with slapos
self
.
log
(
"creating SlapOs Master communicator..."
)
self
.
slapos_communicator
=
SlapOSMasterCommunicator
.
SlapOSMasterCommunicator
(
self
.
cert_path
,
self
.
key_path
,
...
...
erp5/util/testnode/Updater.py
View file @
3f565f87
...
...
@@ -99,6 +99,27 @@ class Updater(object):
def git_update_server_info(self):
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):
try:
return self._git_cache[ref]
...
...
erp5/util/testnode/testnode.py
View file @
3f565f87
...
...
@@ -166,16 +166,18 @@ extends = %(software_config_path)s
# <obfuscated_url> word is modified by in runner.prepareSlapOSForTestSuite()
profile_content_list
.
append
(
"""
[%(buildout_section_id)s]
repository = <obfuscated_url>/%(buildout_section_id)s
"""
%
{
'buildout_section_id'
:
buildout_section_id
})
repository = <obfuscated_url>/%(buildout_section_id)s/%(buildout_section_id)s.git
branch = %(branch)s
"""
%
{
'buildout_section_id'
:
buildout_section_id
,
'branch'
:
vcs_repository
.
get
(
'branch'
,
'master'
)})
else
:
profile_content_list
.
append
(
"""
[%(buildout_section_id)s]
repository = %(repository_path)s
branch = %(branch)s
"""
%
{
'buildout_section_id'
:
buildout_section_id
,
'repository_path'
:
repository_path
,
'branch'
:
vcs_repository
.
get
(
'branch'
,
'master'
)})
"""
%
{
'buildout_section_id'
:
buildout_section_id
,
'repository_path'
:
repository_path
,
'branch'
:
vcs_repository
.
get
(
'branch'
,
'master'
)})
if
not
profile_path_count
:
raise
ValueError
(
PROFILE_PATH_KEY
+
' not defined'
)
# Write file
...
...
@@ -262,6 +264,7 @@ branch = %(branch)s
process_manager
=
self
.
process_manager
)
updater
.
checkout
()
updater
.
git_update_server_info
()
updater
.
git_create_repository_link
()
node_test_suite
.
revision
=
test_result
.
revision
def
_cleanupLog
(
self
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment