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
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
Joanne Hugé
slapos
Commits
e05c9b05
Commit
e05c9b05
authored
Jun 28, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scalability: stack/erp5 up
parent
affd4fe9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
33 deletions
+71
-33
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+64
-13
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+5
-20
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-0
No files found.
stack/erp5/buildout.cfg
View file @
e05c9b05
...
@@ -11,12 +11,13 @@ extensions =
...
@@ -11,12 +11,13 @@ extensions =
mr.developer
mr.developer
find-links =
find-links =
http://192.168.242.75:1235/
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
http://dist.repoze.org
http://dist.repoze.org
http://www.nexedi.org/static/packages/source/
http://www.nexedi.org/static/packages/source/
http://www.owlfish.com/software/wsgiutils/download.html
http://www.owlfish.com/software/wsgiutils/download.html
https://pypi.python.org/packages/source/z/z3c.etestbrowser/
https://pypi.python.org/packages/source/z/zope.testbrowser/
allow-hosts += pybrary.net
allow-hosts += pybrary.net
...
@@ -106,6 +107,7 @@ parts =
...
@@ -106,6 +107,7 @@ parts =
testrunner
testrunner
test_suite_runner
test_suite_runner
scalability_test_suite_runner
scalability_test_suite_runner
performance_tester
# basic Xorg
# basic Xorg
libXdmcp
libXdmcp
...
@@ -135,15 +137,19 @@ parts =
...
@@ -135,15 +137,19 @@ parts =
# Local development
# Local development
slapos.cookbook-repository
slapos.cookbook-repository
check-recipe
erp5.dev-repository
erp5.util
slapos.cookbook
slapos.cookbook
slapos.recipe.template
slapos.recipe.template
# Create instance template
# Create instance template
template
template
erp5.dev-repository
erp5.util
check-recipe
erp5.util-check
erp5.util-check
[erp5.dev-repository]
[erp5.dev-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://192.168.242.75:1235/erp5.git
repository = http://192.168.242.75:1235/erp5.git
...
@@ -172,7 +178,7 @@ mode = 644
...
@@ -172,7 +178,7 @@ mode = 644
[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
branch = erp5-cluster-z2.13
branch = erp5-cluster-z2.13
-scalability
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[check-recipe]
[check-recipe]
...
@@ -245,7 +251,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
...
@@ -245,7 +251,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
8e65d656bbece98261418e6b47f07d5a
md5sum =
9db875c7b8c4149ffe77d475660496d4
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
...
@@ -323,7 +329,7 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc
...
@@ -323,7 +329,7 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc
[template-scalability]
[template-scalability]
< = download-base
< = download-base
filename = instance-scalability.cfg.in
filename = instance-scalability.cfg.in
md5sum =
fb479b5d2732fa32795be3ecb2ab22c9
md5sum =
82f88b1d2e858cce2595c9db34cfa8dc
[template-zeo]
[template-zeo]
< = download-base
< = download-base
...
@@ -449,14 +455,41 @@ initialization =
...
@@ -449,14 +455,41 @@ initialization =
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
# TODO : make also a binary for performance_tester
# Test to make binary
[scalability_test_suite_runner]
[scalability_test_suite_runner]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
scripts = erp5.util.scalability.runScalabilityTestSuite:main
entry-points =
runScalabilityTestSuite=erp5.util.scalability.runScalabilityTestSuite:main
scripts = runScalabilityTestSuite
initialization =
import os
import sys
import erp5.util
[Products.__path__.insert(0, p) for p in reversed(os.environ.get('INSERT_PRODUCTS_PATH', '').split(':')) if p]
import Zope2
os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
os.environ['ZOPE_SCRIPTS'] = ''
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
[performance_tester]
recipe = zc.recipe.egg
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
entry-points =
performance_tester=erp5.util.benchmark.performance_tester:main
scripts = performance_tester
initialization =
import os
import sys
import erp5.util
[Products.__path__.insert(0, p) for p in reversed(os.environ.get('INSERT_PRODUCTS_PATH', '').split(':')) if p]
import Zope2
os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
os.environ['ZOPE_SCRIPTS'] = ''
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
[eggs]
[eggs]
...
@@ -541,6 +574,15 @@ eggs =
...
@@ -541,6 +574,15 @@ eggs =
# Needed for parsing .po files from our Localizer subset
# Needed for parsing .po files from our Localizer subset
polib
polib
# performance_tester dependencies
z3c.etestbrowser
zope.testbrowser
# runScalabilityTestSuite dependencie
slapos.core
psutil
# parameterizing the version of the generated python interpreter name by the
# parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the
# python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance
# installation of python, which we don't want on an instance
...
@@ -554,7 +596,8 @@ scripts =
...
@@ -554,7 +596,8 @@ scripts =
web_checker_utility = erp5.util.webchecker:web_checker_utility
web_checker_utility = erp5.util.webchecker:web_checker_utility
extra-paths =
extra-paths =
${erp5:location}
# ${erp5:location}
${erp5.dev-repository:location}
[zodbanalyze]
[zodbanalyze]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
@@ -583,11 +626,19 @@ scripts =
...
@@ -583,11 +626,19 @@ scripts =
zodbpack
zodbpack
[cloudooo]
[cloudooo]
# cloudooo section tries to use python2.6, which doesn't exist anymore.
# cloudooo section tries to use python2.6, which doesn't exist anymore.
# Make it use 2.7 instead.
# Make it use 2.7 instead.
python = python2.7
python = python2.7
[versions]
[versions]
z3c.etestbrowser = 2.0.0
zope.testbrowser =
slapos.core = 0.32.3
psutil =
# pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
# pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
Acquisition = 2.13.7nxd001
Acquisition = 2.13.7nxd001
Products.DCWorkflow = 2.2.3nxd002
Products.DCWorkflow = 2.2.3nxd002
...
...
stack/erp5/instance-scalability.cfg.in
View file @
e05c9b05
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
[buildout]
[buildout]
parts =
parts =
erp5-cluster
erp5-cluster
launcher
binary-wrap-launcher
binary-wrap-launcher
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
...
@@ -28,32 +27,18 @@ config =
...
@@ -28,32 +27,18 @@ config =
extra-config =
extra-config =
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
# Create binary
[launcher]
scripts =
runScalabilityTestSuite = erp5.util.scalability.runScalabilityTestSuite:main
log-path = ${basedirectory:log}/runScalabilityTestSuite.log
binary-path = ${:bin-directory}/runScalabilityTestSuite
# TODO : make also a wrapper for performance_tester (used by runScalabilityTestSuite)
# Create wrapper and execute command with parameters
# Create wrapper and execute command with parameters
[binary-wrap-launcher]
[binary-wrap-launcher]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
log-path = ${basedirectory:log}/runScalabilityTestSuite.log
binary-path = {{ bin_directory }}/runScalabilityTestSuite
wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
output = ${launcher:binary-path}
output = ${
binary-wrap-
launcher:binary-path}
# TODO : get the erp5-cluster main url (apache listening user port ?)
# TODO : get the erp5-cluster main url (apache listening user port ?)
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
command-line = "${binary-wrap-launcher:wrapper-path}\
# -\ dirty way to conserve spaces
--erp5-url ${binary-wrap-launcher:erp5-url}\
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}
--test-result-path {{ dumps(slapparameter_dict.get('test-result-path')) }}\
--revision {{ dumps(slapparameter_dict.get('revision')) }}\
--node-title {{ dumps(slapparameter_dict.get('node-title')) }}\
--test-suite-master-url {{ dumps(slapparameter_dict.get('test-suite-master-url')) }}\
--log-path = ${launcher:log-path}"
return = url
return = url
...
...
stack/erp5/instance.cfg.in
View file @
e05c9b05
...
@@ -235,7 +235,9 @@ extra-context =
...
@@ -235,7 +235,9 @@ extra-context =
template = {{ template_scalability }}
template = {{ template_scalability }}
filename = instance-scalability.cfg
filename = instance-scalability.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
bin_directory = {{ bin_directory }}
extra-context =
extra-context =
key bin_directory dynamic-template-scalability:bin_directory
key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
# Must match the key id in [switch-softwaretype] which uses this section.
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type scalability
raw software_type scalability
...
...
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