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
Eteri
slapos
Commits
42c6a8c7
Commit
42c6a8c7
authored
Aug 14, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
KVM SR: scalability testnode integration.
parent
5c9da475
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
71 additions
and
11 deletions
+71
-11
software/kvm/common.cfg
software/kvm/common.cfg
+5
-5
software/kvm/development.cfg
software/kvm/development.cfg
+1
-1
software/kvm/instance-kvm-resilient-test.cfg.jinja2
software/kvm/instance-kvm-resilient-test.cfg.jinja2
+49
-0
software/kvm/instance.cfg.in
software/kvm/instance.cfg.in
+16
-5
No files found.
software/kvm/common.cfg
View file @
42c6a8c7
...
@@ -79,7 +79,7 @@ command =
...
@@ -79,7 +79,7 @@ command =
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
#md5sum =
461187060d12a6bea4d5b9699687c0e
9
#md5sum =
bdd0495ef729e7272ec9c97aca919c0
9
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
...
@@ -98,11 +98,11 @@ md5sum = 6753004b582c0470bd028253ce1964ad
...
@@ -98,11 +98,11 @@ md5sum = 6753004b582c0470bd028253ce1964ad
download-only = true
download-only = true
[template-kvm-resilient-test]
[template-kvm-resilient-test]
recipe = slapos.recipe.template
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.in
url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
#md5sum = 9dead7572072307b6c38cdf47052225b
md5sum = dc90fba4325dc255fac13fb5af5fa166
output = ${buildout:directory}/template-kvm-resilient-test.cfg
mode = 0644
mode = 0644
download-only = true
[template-kvm-import]
[template-kvm-import]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
...
software/kvm/development.cfg
View file @
42c6a8c7
...
@@ -23,7 +23,7 @@ git-executable = ${git:location}/bin/git
...
@@ -23,7 +23,7 @@ git-executable = ${git:location}/bin/git
[slapos.toolbox-repository]
[slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git
repository = http://git.erp5.org/repos/slapos.toolbox.git
branch =
master
branch =
kvmresiliency
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[erp5.util-repository]
[erp5.util-repository]
...
...
software/kvm/instance-kvm-resilient-test.cfg.
in
→
software/kvm/instance-kvm-resilient-test.cfg.
jinja2
View file @
42c6a8c7
[buildout]
[buildout]
eggs-directory =
${buildout:eggs-directory
}
eggs-directory =
{{ eggs_directory }
}
develop-eggs-directory =
${buildout:develop-eggs-directory
}
develop-eggs-directory =
{{ develop_eggs_directory }
}
offline = true
offline = true
parts =
parts =
...
@@ -10,45 +10,40 @@ parts =
...
@@ -10,45 +10,40 @@ parts =
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc/
home = ${buildout:directory}
var = $${buildout:directory}/var/
etc = ${:home}/etc/
srv = $${buildout:directory}/srv/
var = ${:home}/var/
bin = $${buildout:directory}/bin/
srv = ${:home}/srv/
tmp = $${buildout:directory}/tmp/
bin = ${:home}/bin/
tmp = ${:home}/tmp/
services = $${:etc}/service/
log = ${:var}/log/
scripts = $${:etc}/run/
services = ${:etc}/service/
scripts = ${:etc}/run/
[deploy-resiliency-test]
[deploy-resiliency-test]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
#log-path = {directory:log}
wrapper-path = ${directory:scripts}/runKVMResiliencyTestSuite
wrapper-path = $${directory:bin}/runKVMResiliencyTestSuite
testnode-parameters = --test-result-path={{ slapparameter_dict.get('test-result-path') }} --revision={{ slapparameter_dict.get('test-suite-revision') }} --node-title={{ slapparameter_dict.get('scalability-launcher-title') }} --test-suite={{ slapparameter_dict.get('test-suite') }} --test-suite-master-url={{ slapparameter_dict.get('test-suite-master-url') }} --log-path=${directory:log}
#output = $${binary-wrap-launcher:binary-path}
kvm-test-parameters = server_url=${slap-connection:server-url} key_file=${slap-connection:key-file} cert_file=${slap-connection:cert-file} computer_id=${slap-connection:computer-id} partition_id=${slap-connection:partition-id} software=${slap-connection:software-release-url} namebase=kvm kvm_rootinstance_name='${request-resilient-kvm:name}'
#site-id = "{site_id}"
# Suppose that there is a user zope family in the configuration
command-line = {{ bin_directory }}/runResiliencyTest ${:testnode-parameters} ${:kvm-test-parameters}
#erp5-url = $${erp5-cluster:connection-family-user}{:site-id}
#parameters-extra = $*
command-line = ${buildout:bin-directory}/runKVMResiliencyTestSuite --server-url=$${slap-connection:server-url} --key-file=$${slap-connection:key-file} --cert-file=$${slap-connection:cert-file} --computer-id=$${slap-connection:computer-id} --partition-id=$${slap-connection:partition-id} --software=$${slap-connection:software-release-url} --namebase=kvm --kvm-rootinstance-name='$${request-resilient-kvm:name}'
#return = url
[request-resilient-kvm]
[request-resilient-kvm]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:request
recipe = slapos.cookbook:request
software-url = $
$
{slap-connection:software-release-url}
software-url = ${slap-connection:software-release-url}
software-type = kvm-resilient
software-type = kvm-resilient
name = Resilient KVM (Root Instance)
name = Resilient KVM (Root Instance)
config = virtual-hard-drive-url virtual-hard-drive-md5sum resiliency-backup-periodicity
config = virtual-hard-drive-url virtual-hard-drive-md5sum resiliency-backup-periodicity
config-virtual-hard-drive-url = $
$
{slap-parameter:virtual-hard-drive-url}
config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
config-virtual-hard-drive-md5sum = $
$
{slap-parameter:virtual-hard-drive-md5sum}
config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-resiliency-backup-periodicity = */5
config-resiliency-backup-periodicity = */5
# We don't use url parameter, but we want it to be there to make sure root instance is ready.
# We don't use url parameter, but we want it to be there to make sure root instance is ready.
return = url
return = url
# XXX What to do?
# XXX What to do?
#sla = instance_guid
#sla = instance_guid
#sla-instance_guid = $
$
{slap-parameter:frontend-instance-guid}
#sla-instance_guid = ${slap-parameter:frontend-instance-guid}
[slap-parameter]
[slap-parameter]
virtual-hard-drive-url = https://softinst43236.host.vifib.net/data/public/8e2138.php?dl=true
virtual-hard-drive-url = https://softinst43236.host.vifib.net/data/public/8e2138.php?dl=true
virtual-hard-drive-md5sum = de0f10c7c6538e9928879332afd9be7a
virtual-hard-drive-md5sum = de0f10c7c6538e9928879332afd9be7a
# XXX: what to do about pbs-kvm1-computer-guid and kvm1-computer-guid ?
software/kvm/instance.cfg.in
View file @
42c6a8c7
...
@@ -17,7 +17,7 @@ kvm-import = ${template-kvm-import:output}
...
@@ -17,7 +17,7 @@ kvm-import = ${template-kvm-import:output}
kvm-export = ${template-kvm-export:output}
kvm-export = ${template-kvm-export:output}
# Used for the test of resiliency. The system wants a "test" software_type.
# Used for the test of resiliency. The system wants a "test" software_type.
test = $
{template-kvm-resilient-test:output
}
test = $
${dynamic-template-kvm-resilient-test:rendered
}
frozen = ${instance-frozen:output}
frozen = ${instance-frozen:output}
pull-backup = ${template-pull-backup:output}
pull-backup = ${template-pull-backup:output}
...
@@ -34,13 +34,24 @@ cert = $${slap-connection:cert-file}
...
@@ -34,13 +34,24 @@ cert = $${slap-connection:cert-file}
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${template-kvm-resilient:location}/instance-kvm-resilient.cfg.jinja2
template = ${template-kvm-resilient:location}/instance-kvm-resilient.cfg.jinja2
rendered = $${buildout:directory}/template-kvm-resilient.cfg
rendered = $${buildout:directory}/template-kvm-resilient.cfg
context =
key buildout buildout:bin-directory
context =
key develop_eggs_directory buildout:develop-eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
template-parts-destination = ${template-parts:destination}
template-parts-destination = ${template-parts:destination}
template-replicated-destination = ${template-replicated:destination}
template-replicated-destination = ${template-replicated:destination}
import-list = file parts :template-parts-destination
import-list = file parts :template-parts-destination
file replicated :template-replicated-destination
file replicated :template-replicated-destination
mode = 0644
mode = 0644
[dynamic-template-kvm-resilient-test]
recipe = slapos.recipe.template:jinja2
template = ${template-kvm-resilient-test:location}/instance-kvm-resilient-test.cfg.jinja2
rendered = $${buildout:directory}/template-kvm-resilient-test.cfg
bin-directory = ${buildout:bin-directory}
context =
key bin_directory dynamic-template-kvm-resilient-test:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration
mode = 0644
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