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
Romain Courteaud
slapos
Commits
f4f50844
Commit
f4f50844
authored
Mar 31, 2021
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! software/erp5testnode: deploy-test use latest kvm
adjust to changes in kvm software release and erp5.util
parent
4e5f1dd0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
...ware/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
+1
-1
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
+2
-2
software/erp5testnode/testsuite/deploy-test/runTestSuite.py
software/erp5testnode/testsuite/deploy-test/runTestSuite.py
+3
-0
software/erp5testnode/testsuite/deploy-test/software.cfg
software/erp5testnode/testsuite/deploy-test/software.cfg
+6
-5
No files found.
software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg
View file @
f4f50844
...
@@ -18,4 +18,4 @@ md5sum = 8288e59eb442c662544daffbf446a033
...
@@ -18,4 +18,4 @@ md5sum = 8288e59eb442c662544daffbf446a033
[template-deploy-test]
[template-deploy-test]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
b673c497abe5b3e7de4c7fc8b01aa3d
0
md5sum =
c5db797980951b764b69aaa4b60a038
0
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
View file @
f4f50844
...
@@ -28,7 +28,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -28,7 +28,7 @@ recipe = slapos.recipe.template:jinja2
rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
template = inline:
template = inline:
#!/bin/sh
#!/bin/sh
export PATH=${python-with-eggs:location}:$PATH
export PATH=${python
2.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
mode = 0755
context =
context =
...
@@ -37,7 +37,7 @@ context =
...
@@ -37,7 +37,7 @@ context =
[switch_softwaretype]
[switch_softwaretype]
default = $${:deploy-test}
default = $${:deploy-test}
deploy-test =
$${dynamic-template-deploy-test:rendered}
deploy-test =
dynamic-template-deploy-test:rendered
[dynamic-template-deploy-test]
[dynamic-template-deploy-test]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
...
software/erp5testnode/testsuite/deploy-test/runTestSuite.py
View file @
f4f50844
...
@@ -152,9 +152,12 @@ def main():
...
@@ -152,9 +152,12 @@ def main():
revision
=
args
.
revision
revision
=
args
.
revision
test_suite_title
=
args
.
test_suite_title
or
args
.
test_suite
test_suite_title
=
args
.
test_suite_title
or
args
.
test_suite
# TODO: rewrite this unsing nxdtest, EggTestSuite no longer exist in erp5.util
suite
=
testsuite
.
EggTestSuite
(
suite
=
testsuite
.
EggTestSuite
(
1
,
test_suite
=
args
.
test_suite
,
node_quantity
=
args
.
node_quantity
,
1
,
test_suite
=
args
.
test_suite
,
node_quantity
=
args
.
node_quantity
,
python_interpreter
=
args
.
python_interpreter
,
python_interpreter
=
args
.
python_interpreter
,
shared_part_list
=
os
.
environ
.
get
(
'SLAPOS_TEST_SHARED_PART_LIST'
,
''
),
log_directory
=
os
.
environ
.
get
(
'SLAPOS_TEST_LOG_DIRECTORY'
,
''
),
egg_test_path_dict
=
{
egg_test_path_dict
=
{
os
.
path
.
basename
(
os
.
path
.
normpath
(
path
)):
path
os
.
path
.
basename
(
os
.
path
.
normpath
(
path
)):
path
for
path
in
args
.
test_location
.
split
(
','
)},
for
path
in
args
.
test_location
.
split
(
','
)},
...
...
software/erp5testnode/testsuite/deploy-test/software.cfg
View file @
f4f50844
...
@@ -2,9 +2,8 @@
...
@@ -2,9 +2,8 @@
extends =
extends =
buildout.hash.cfg
buildout.hash.cfg
https://lab.nexedi.com/nexedi/slapos/raw/1.0.182/software/kvm/software.cfg
https://lab.nexedi.com/nexedi/slapos/raw/1.0.182/software/kvm/software.cfg
parts =
parts =
eggs
python-with-
eggs
template-deploy-test
template-deploy-test
runTestSuite_py
runTestSuite_py
playbook
playbook
...
@@ -15,7 +14,9 @@ eggs =
...
@@ -15,7 +14,9 @@ eggs =
erp5.util
erp5.util
interpreter = ${:_buildout_section_name_}
interpreter = ${:_buildout_section_name_}
[python-with-eggs]
[python2.7-with-eggs]
# create interpreters named "python" and "python2.7" so that
# instance profile can use them in $PATH
recipe = plone.recipe.command
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -23,8 +24,8 @@ stop-on-error = true
...
@@ -23,8 +24,8 @@ stop-on-error = true
command =
command =
rm -fr ${:location} &&
rm -fr ${:location} &&
mkdir -p ${:location} &&
mkdir -p ${:location} &&
ln -s ${buildout:bin-directory}/
pythonwitheggs
${:location}/python &&
ln -s ${buildout:bin-directory}/
${python-with-eggs:interpreter}
${:location}/python &&
ln -s ${buildout:bin-directory}/
pythonwitheggs
${:location}/python2.7
ln -s ${buildout:bin-directory}/
${python-with-eggs:interpreter}
${:location}/python2.7
update-command = ${:command}
update-command = ${:command}
[playbook]
[playbook]
...
...
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