Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
francois
slapos
Commits
7e60fbf2
Commit
7e60fbf2
authored
Jun 28, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scalability: stack/erp5 Add scalability recipe
parent
e538a91e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
setup.py
setup.py
+1
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-2
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+15
-1
No files found.
setup.py
View file @
7e60fbf2
...
@@ -108,6 +108,7 @@ setup(name=name,
...
@@ -108,6 +108,7 @@ setup(name=name,
'erp5.update = slapos.recipe.erp5_update:Recipe'
,
'erp5.update = slapos.recipe.erp5_update:Recipe'
,
'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe'
,
'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe'
,
'erp5testnode = slapos.recipe.erp5testnode:Recipe'
,
'erp5testnode = slapos.recipe.erp5testnode:Recipe'
,
'scalability = slapos.recipe.scalability:Recipe'
,
'firefox = slapos.recipe.firefox:Recipe'
,
'firefox = slapos.recipe.firefox:Recipe'
,
'fontconfig = slapos.recipe.fontconfig:Recipe'
,
'fontconfig = slapos.recipe.fontconfig:Recipe'
,
'generate.mac = slapos.recipe.generatemac:Recipe'
,
'generate.mac = slapos.recipe.generatemac:Recipe'
,
...
...
stack/erp5/buildout.cfg
View file @
7e60fbf2
...
@@ -179,7 +179,8 @@ mode = 644
...
@@ -179,7 +179,8 @@ mode = 644
# Local development
# Local development
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
#repository = http://git.erp5.org/repos/slapos.git
repository = http://192.168.242.75:1236/slapos.git
branch = erp5-cluster-z2.13-scalability
branch = erp5-cluster-z2.13-scalability
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
...
@@ -321,7 +322,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f
...
@@ -321,7 +322,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f
[template-scalability]
[template-scalability]
< = download-base
< = download-base
filename = instance-scalability.cfg.in
filename = instance-scalability.cfg.in
md5sum =
82f88b1d2e858cce2595c9db34cfa8dc
md5sum =
f32985483f089549a3bfe1a95ab099c3
[template-zeo]
[template-zeo]
< = download-base
< = download-base
...
...
stack/erp5/instance-scalability.cfg.in
View file @
7e60fbf2
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
parts =
parts =
erp5-cluster
erp5-cluster
binary-wrap-launcher
binary-wrap-launcher
scalability-launcher-instance
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -38,14 +39,27 @@ output = ${binary-wrap-launcher:binary-path}
...
@@ -38,14 +39,27 @@ output = ${binary-wrap-launcher:binary-path}
erp5-url = http://foo.bar
erp5-url = http://foo.bar
# Run scalability test suite wrapper command with parameters
# Run scalability test suite wrapper command with parameters
# -\ dirty way to conserve spaces
# -\ dirty way to conserve spaces
command-line = "${binary-wrap-launcher:binary-path}" --erp5-url ${binary-wrap-launcher:erp5-url} --test-result-path {{ slapparameter_dict.get('test-result-path') }} --revision {{ slapparameter_dict.get('revision') }} --node-title {{ slapparameter_dict.get('node-title') }} --test-suite-master-url {{ slapparameter_dict.get('test-suite-master-url') }} --log-path ${binary-wrap-launcher:log-path}
# command-line = "${binary-wrap-launcher:binary-path}" --erp5-url ${binary-wrap-launcher:erp5-url} --test-result-path {{ slapparameter_dict.get('test-result-path') }} --revision {{ slapparameter_dict.get('revision') }} --node-title {{ slapparameter_dict.get('node-title') }} --test-suite-master-url {{ slapparameter_dict.get('test-suite-master-url') }} --log-path ${binary-wrap-launcher:log-path}
command-line = ${binary-wrap-launcher:binary-path}
return = url
return = url
[scalability-launcher-instance]
recipe = slapos.cookbook:scalability
configuration-file = ${rootdirectory:etc}/scalability_runner.conf
wrapper = ${basedirectory:services}/scalability_runner
erp5-url = ${binary-wrap-launcher:erp5-url}
test-result-path = {{ slapparameter_dict.get('test-result-path') }}
revision = {{ slapparameter_dict.get('revision') }}
node-title = {{ slapparameter_dict.get('node-title') }}
test-suite-master-url = {{ slapparameter_dict.get('test-suite-master-url') }}
log-path = ${binary-wrap-launcher:log-path}
# Create partition's directories
# Create partition's directories
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
log = ${rootdirectory:var}/log
log = ${rootdirectory:var}/log
services = ${rootdirectory:etc}/run
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
...
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