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
Thomas Gambier
slapos
Commits
405f2b7e
Commit
405f2b7e
authored
Sep 07, 2022
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: fix deploy-test software
parent
4f77e860
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
27 deletions
+8
-27
software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
...ware/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
+1
-1
software/erp5testnode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2
...ode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2
+1
-1
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
+5
-8
software/erp5testnode/testsuite/deploy-test/software.cfg
software/erp5testnode/testsuite/deploy-test/software.cfg
+1
-17
No files found.
software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
View file @
405f2b7e
...
@@ -18,4 +18,4 @@ md5sum = 8357771b70efd0740561b1cb46f6955e
...
@@ -18,4 +18,4 @@ md5sum = 8357771b70efd0740561b1cb46f6955e
[template-deploy-test]
[template-deploy-test]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
c5db797980951b764b69aaa4b60a0380
md5sum =
062e677990ca0cd0c0396993c58b46a2
software/erp5testnode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2
View file @
405f2b7e
...
@@ -22,7 +22,7 @@ parts =
...
@@ -22,7 +22,7 @@ parts =
[request-kvm]
[request-kvm]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:request
recipe = slapos.cookbook:request
.serialised
software-url = ${slap-connection:software-release-url}
software-url = ${slap-connection:software-release-url}
software-type = kvm
software-type = kvm
name = test-kvm
name = test-kvm
...
...
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
View file @
405f2b7e
...
@@ -25,24 +25,22 @@ command =
...
@@ -25,24 +25,22 @@ command =
[runTestSuite]
[runTestSuite]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
rendered
= $${buildout:directory}/bin/$${:_buildout_section_name_}
output
= $${buildout:directory}/bin/$${:_buildout_section_name_}
template = inline:
inline =
#!/bin/sh
#!/bin/sh
export PATH=${python2.7-with-eggs:location}:$PATH
exec ${buildout:bin-directory}/${runTestSuite_py:interpreter} ${:_profile_base_location_}/runTestSuite.py --partition_ipv4 {{ list(partition_ipv4)[0] }} --partition_path $${buildout:directory} --test_reference "{{ slapparameter_dict.get('image-to-test-url') }} {{ slapparameter_dict.get('script-to-test-url')}}" --test_location "${test-location:base}/{{ slapparameter_dict.get('test-relative-directory', 'playbook/roles/standalone-shared') }}" --python_interpreter=${buildout:bin-directory}/${runTestSuite_py:interpreter} "$@"
exec ${buildout:bin-directory}/${runTestSuite_py:interpreter} ${:_profile_base_location_}/runTestSuite.py --partition_ipv4 {{ list(partition_ipv4)[0] }} --partition_path $${buildout:directory} --test_reference "{{ slapparameter_dict.get('image-to-test-url') }} {{ slapparameter_dict.get('script-to-test-url')}}" --test_location "${test-location:base}/{{ slapparameter_dict.get('test-relative-directory', 'playbook/roles/standalone-shared') }}" --python_interpreter=${buildout:bin-directory}/${runTestSuite_py:interpreter} "$@"
mode = 0755
context =
context =
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
key partition_ipv4 slap-configuration:ipv4
key partition_ipv4 slap-configuration:ipv4
[switch_softwaretype]
[switch_softwaretype]
default = $${:deploy-test}
default = $${:deploy-test}
deploy-test = dynamic-template-deploy-test:
rendered
deploy-test = dynamic-template-deploy-test:
output
[dynamic-template-deploy-test]
[dynamic-template-deploy-test]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template
= ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
url
= ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
rendered
= $${buildout:directory}/template-deploy-test.cfg
output
= $${buildout:directory}/template-deploy-test.cfg
context =
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
...
@@ -52,4 +50,3 @@ context =
...
@@ -52,4 +50,3 @@ context =
raw in_vm_test_script_md5 ${deploy-script-controller-script:md5sum}
raw in_vm_test_script_md5 ${deploy-script-controller-script:md5sum}
raw waittime ${deploy-script-controller-script:waittime}
raw waittime ${deploy-script-controller-script:waittime}
raw tries ${deploy-script-controller-script:tries}
raw tries ${deploy-script-controller-script:tries}
mode = 0644
software/erp5testnode/testsuite/deploy-test/software.cfg
View file @
405f2b7e
[buildout]
[buildout]
extends =
extends =
buildout.hash.cfg
buildout.hash.cfg
https://lab.nexedi.com/nexedi/slapos/raw/1.0.2
64
/software/kvm/software.cfg
https://lab.nexedi.com/nexedi/slapos/raw/1.0.2
71
/software/kvm/software.cfg
parts =
parts =
python-with-eggs
python-with-eggs
template-deploy-test
template-deploy-test
...
@@ -15,23 +15,8 @@ eggs =
...
@@ -15,23 +15,8 @@ eggs =
requests
requests
interpreter = ${:_buildout_section_name_}
interpreter = ${:_buildout_section_name_}
[python2.7-with-eggs]
# create interpreters named "python" and "python2.7" so that
# instance profile can use them in $PATH
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
command =
rm -fr ${:location} &&
mkdir -p ${:location} &&
ln -s ${buildout:bin-directory}/${python-with-eggs:interpreter} ${:location}/python &&
ln -s ${buildout:bin-directory}/${python-with-eggs:interpreter} ${:location}/python2.7
update-command = ${:command}
[playbook]
[playbook]
recipe = plone.recipe.command
recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
environment = export PATH=${tar:location}/bin:${gzip:location}/bin:$PATH
environment = export PATH=${tar:location}/bin:${gzip:location}/bin:$PATH
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -70,7 +55,6 @@ location = ${:_profile_base_location_}/${:filename}
...
@@ -70,7 +55,6 @@ location = ${:_profile_base_location_}/${:filename}
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
[versions]
[versions]
erp5.util = 0.4.69
erp5.util = 0.4.69
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