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
Levin Zimmermann
slapos
Commits
61af9dda
Commit
61af9dda
authored
Jun 19, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test
parent
2846462c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
75 deletions
+34
-75
setup.py
setup.py
+1
-0
slapos/recipe/generic_scalability_launcher/__init__.py
slapos/recipe/generic_scalability_launcher/__init__.py
+11
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+7
-1
stack/erp5/instance-scalability-launcher.cfg.in
stack/erp5/instance-scalability-launcher.cfg.in
+0
-38
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+15
-34
No files found.
setup.py
View file @
61af9dda
...
@@ -104,6 +104,7 @@ setup(name=name,
...
@@ -104,6 +104,7 @@ setup(name=name,
'fontconfig = slapos.recipe.fontconfig:Recipe'
,
'fontconfig = slapos.recipe.fontconfig:Recipe'
,
'generate.mac = slapos.recipe.generatemac:Recipe'
,
'generate.mac = slapos.recipe.generatemac:Recipe'
,
'generate.password = slapos.recipe.generatepassword:Recipe'
,
'generate.password = slapos.recipe.generatepassword:Recipe'
,
'generic.scalability.launcher = slapos.recipe.generic_scalability_launcher:Recipe'
,
'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe'
,
'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe'
,
'generic.kumofs = slapos.recipe.generic_kumofs:Recipe'
,
'generic.kumofs = slapos.recipe.generic_kumofs:Recipe'
,
'generic.memcached = slapos.recipe.generic_memcached:Recipe'
,
'generic.memcached = slapos.recipe.generic_memcached:Recipe'
,
...
...
slapos/recipe/generic_scalability_launcher/__init__.py
View file @
61af9dda
...
@@ -27,10 +27,19 @@
...
@@ -27,10 +27,19 @@
import
os
import
os
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
# options needed :
#
# url
# scalability-launcher-log
# scalability-launcher-binary
# test-suite-title
# shell-path
# scalability-launcher-wrapper
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
def
install
(
self
):
def
install
(
self
):
# Var
passed to
template
# Var
iables used in the
template
config
=
dict
(
config
=
dict
(
url
=
self
.
options
[
'url'
],
url
=
self
.
options
[
'url'
],
scalability_launcher_log
=
self
.
options
[
'scalability-launcher-log'
],
scalability_launcher_log
=
self
.
options
[
'scalability-launcher-log'
],
...
@@ -39,7 +48,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -39,7 +48,7 @@ class Recipe(GenericBaseRecipe):
shell_path
=
self
.
options
[
'shell-path'
],
shell_path
=
self
.
options
[
'shell-path'
],
)
)
#
Executable creation and return the path
#
Just create a wrapper
path_list
=
[]
path_list
=
[]
path_list
.
append
(
self
.
createExecutable
(
self
.
options
[
'scalability-launcher-wrapper'
],
path_list
.
append
(
self
.
createExecutable
(
self
.
options
[
'scalability-launcher-wrapper'
],
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'launcher.in'
),
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'launcher.in'
),
...
...
stack/erp5/buildout.cfg
View file @
61af9dda
...
@@ -252,6 +252,7 @@ extra-context =
...
@@ -252,6 +252,7 @@ extra-context =
key template_erp5_single template-erp5-single:target
key template_erp5_single template-erp5-single:target
key template_erp5_cluster template-erp5-cluster:target
key template_erp5_cluster template-erp5-cluster:target
key template_scalability template-scalability:target
key template_scalability template-scalability:target
key template_scalability_launcher template-scalability-launcher:target
key template_kumofs template-kumofs:target
key template_kumofs template-kumofs:target
key template_logrotate_base template-logrotate-base:rendered
key template_logrotate_base template-logrotate-base:rendered
key template_mariadb template-mariadb:target
key template_mariadb template-mariadb:target
...
@@ -281,7 +282,12 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc
...
@@ -281,7 +282,12 @@ md5sum = d4d95f1749e1d9d3701565f934fcd4dc
[template-scalability]
[template-scalability]
< = download-base
< = download-base
filename = instance-scalability.cfg.in
filename = instance-scalability.cfg.in
md5sum = xxxxxxxxxxxxxxxxxxxxxxxxxx
md5sum = 6d33726c7cbe727fe7175080864e3ea1
[template-scalability-launcher]
< = download-base
filename = instance-scalability-launcher.cfg.in
md5sum = 7a15da7342d72a996e5325c69bf17a04
[template-zeo]
[template-zeo]
< = download-base
< = download-base
...
...
stack/erp5/instance-scalability-launcher.cfg.in
deleted
100644 → 0
View file @
2846462c
{% if software_type == slap_software_type -%}
[buildout]
parts =
scalability-launcher-instance
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[scalability-launcher-instance]
recipe = slapos.cookbook:generic.scalability_launcher
#
# maybe be change this variable name
# just need to know test_result url ?
url = "http://foo.bar"
# the suite to launch (?)
test-suite-title = "ERP5-Sca"
# Paths: Running wrappers
scalability-launcher-wrapper = ${basedirectory:services}/scalability_launcher
# Paths: Logs
scalability-launcher-log = ${basedirectory:log}/scalability_launcher.log
# Binary information
scalability-launcher-binary = {{ parameter_dict['scalability-location'] }}/bin/scalability_launcher
shell-path = {{ parameter_dict['dash-location'] }}/bin/dash
# Directory creation
[basedirectory]
recipe = slapos.cookbook:mkdirectory
log = ${rootdirectory:var}/log
run = ${rootdirectory:var}/run
services = ${rootdirectory:etc}/run
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
var = ${buildout:directory}/var
srv = ${buildout:directory}/srv
bin = ${buildout:directory}/bin
\ No newline at end of file
stack/erp5/instance-scalability.cfg.in
View file @
61af9dda
{% if slap_software_type == software_type -%}
{% if slap_software_type == software_type -%}
[buildout]
parts =
erp5-cluster
request-scalability-launcher
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[request-common]
[request-common]
recipe = slapos.cookbook:request.serialised
recipe = slapos.cookbook:request.serialised
software-url = ${slap-connection:software-release-url}
software-url = ${slap-connection:software-release-url}
...
@@ -16,43 +24,16 @@ config =
...
@@ -16,43 +24,16 @@ 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)) }}
[
request-
erp5-cluster]
[erp5-cluster]
<=request-common
recipe = slapos.cookbook:softwaretype
name = ERP5 Cluster
name = ERP5 Cluster
software-type = cluster
software-type = cluster
[request-scalability-launcher]
[request-launcher-base]
<=request-common
<=request-common
return =
name = Scalability Launcher 1
extra-config =
slave = false
software-type = launcher
sla-computer_guid = {{ slapparameter_dict.get('scalability-launcher-computer-guid', computer_id) }}
[request-scalability-launcher-1]
< = request-launcher-base
name = scalability-launcher-1
sla-computer_guid = {{ slapparameter_dict.get('scalability-launcher-computer-guid') }}
# Generate launcher instance requests
#{% for comp_name in slapparameter_dict.get('launcher-partition-dict', {'1': {}}) -%}
#{% set base_name = 'scalability-launcher-' ~ comp_name -%}
#{% set name = 'request-' ~ base_name -%}
#[{{ name }}]
#< = request-launcher-base
#name = {{ base_name }}
#sla-computer_guid = {{ comp_name }}
#{% endfor -%}
[publish]
recipe = slapos.cookbook:publish.serialised
{% for family_name, publishable in publish_dict.items() -%}
{{ family_name }} = {{ '${' ~ publishable ~ '}' }}
{% endfor -%}
[buildout]
parts = publish
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
{% endif %}
{% endif %}
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