Commit 2db64cda authored by Łukasz Nowak's avatar Łukasz Nowak

testsuite/deploy-test: Download runTestSuite.py

Previously it was used directly from the profile, but it results with
incorrectly working system in some cases.
parent 95be9063
...@@ -22,4 +22,8 @@ md5sum = 74a67feae58ed3a1e71defca043ada9c ...@@ -22,4 +22,8 @@ md5sum = 74a67feae58ed3a1e71defca043ada9c
[template-deploy-test] [template-deploy-test]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8b92f1b8c8d70025b44fa35e478b090c md5sum = e6725ae423568601b180a28c29fff330
[runTestSuite.py]
filename = runTestSuite.py
md5sum = df9f7773359b29c9dadc215a7df930a4
...@@ -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=${python2.7-with-eggs:location}:$PATH 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} ${runTestSuite.py:target} --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 =
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
......
...@@ -55,6 +55,11 @@ git-executable = ${git:location}/bin/git ...@@ -55,6 +55,11 @@ git-executable = ${git:location}/bin/git
[template] [template]
output = ${buildout:directory}/template-original.kvm.cfg output = ${buildout:directory}/template-original.kvm.cfg
[runTestSuite.py]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
mode = 0755
[deploy-script-controller-script] [deploy-script-controller-script]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
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