Commit 6d1aef56 authored by Jérome Perrin's avatar Jérome Perrin

deploy-test: EggTestSuite needs a python_interpreter argument

This is required starting erp5.utils 0.4.51

Also add a missing md5sum for instance.cfg.in

/reviewed-on nexedi/slapos!362
parent 244c20f8
...@@ -29,7 +29,7 @@ rendered = $${buildout:directory}/bin/$${:_buildout_section_name_} ...@@ -29,7 +29,7 @@ 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-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')}}" "$@" 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')}}" --python_interpreter=${buildout:bin-directory}/${runTestSuite_py:interpreter} "$@"
mode = 0755 mode = 0755
context = context =
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
......
...@@ -143,6 +143,10 @@ def main(): ...@@ -143,6 +143,10 @@ def main():
'--test_location', '--test_location',
help="Location of the tests" help="Location of the tests"
) )
parser.add_argument(
'--python_interpreter',
help="Path to python interpreter used to run the test suite"
)
args = parser.parse_args() args = parser.parse_args()
...@@ -150,6 +154,7 @@ def main(): ...@@ -150,6 +154,7 @@ def main():
test_suite_title = args.test_suite_title or args.test_suite test_suite_title = args.test_suite_title or args.test_suite
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,
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(',')},
......
...@@ -72,6 +72,7 @@ location = ${:_profile_base_location_}/${:filename} ...@@ -72,6 +72,7 @@ location = ${:_profile_base_location_}/${:filename}
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
md5sum = 616abb7fb4608321e11ade0a43b0ce4b
mode = 0644 mode = 0644
[versions] [versions]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment