Commit 95be9063 authored by Łukasz Nowak's avatar Łukasz Nowak

testsuite/deploy-test: Stabilise script usage

Just download it and use file:// schema, so it can be used with locally
available profile and fetched from the url.

Previously the instance was downloading content from the profile URL,
which is simply bad idea.
parent 2c5bb4a5
...@@ -18,8 +18,8 @@ md5sum = 8288e59eb442c662544daffbf446a033 ...@@ -18,8 +18,8 @@ md5sum = 8288e59eb442c662544daffbf446a033
[dynamic-template-deploy-test] [dynamic-template-deploy-test]
filename = instance-deploy-test.cfg.jinja2 filename = instance-deploy-test.cfg.jinja2
md5sum = 2acfeff0ec42c28253dfba831ccc5276 md5sum = 74a67feae58ed3a1e71defca043ada9c
[template-deploy-test] [template-deploy-test]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 22947ea73755a820524f69a7f45bc887 md5sum = 8b92f1b8c8d70025b44fa35e478b090c
...@@ -34,7 +34,7 @@ config-virtual-hard-drive-url = {{ slapparameter_dict.get('image-to-test-url') } ...@@ -34,7 +34,7 @@ config-virtual-hard-drive-url = {{ slapparameter_dict.get('image-to-test-url') }
config-virtual-hard-drive-md5sum = {{ slapparameter_dict.get('image-to-test-md5sum') }} config-virtual-hard-drive-md5sum = {{ slapparameter_dict.get('image-to-test-md5sum') }}
# The test script # The test script
config-bootstrap-script-url = {{ in_vm_test_script }}#{{ in_vm_test_script_md5 }} config-bootstrap-script-url = file://{{ in_vm_test_script }}#{{ in_vm_test_script_md5 }}
# Script configuration # Script configuration
config-data-to-vm = config-data-to-vm =
......
...@@ -48,7 +48,7 @@ context = ...@@ -48,7 +48,7 @@ context =
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
raw bin_directory ${buildout:bin-directory} raw bin_directory ${buildout:bin-directory}
raw in_vm_test_script ${deploy-script-controller-script:location} raw in_vm_test_script ${deploy-script-controller-script:target}
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}
......
...@@ -56,7 +56,8 @@ git-executable = ${git:location}/bin/git ...@@ -56,7 +56,8 @@ git-executable = ${git:location}/bin/git
output = ${buildout:directory}/template-original.kvm.cfg output = ${buildout:directory}/template-original.kvm.cfg
[deploy-script-controller-script] [deploy-script-controller-script]
location = ${:_profile_base_location_}/${:filename} recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
# configuration # configuration
waittime = 360 waittime = 360
tries = 80 tries = 80
......
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