From 2155ba2654b366599839c1ca7902b485b3748a45 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov Date: Thu, 4 Jul 2019 15:38:02 +0300 Subject: [PATCH 1/2] Use latest one with nowait patch. --- software/erp5testnode/testsuite/deploy-test/software.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/erp5testnode/testsuite/deploy-test/software.cfg b/software/erp5testnode/testsuite/deploy-test/software.cfg index 4e1ce15302..3a25cfff7d 100644 --- a/software/erp5testnode/testsuite/deploy-test/software.cfg +++ b/software/erp5testnode/testsuite/deploy-test/software.cfg @@ -1,5 +1,5 @@ [buildout] -extends = https://lab.nexedi.com/nexedi/slapos/raw/1.0.111/software/kvm/software.cfg +extends = https://lab.nexedi.com/nexedi/slapos/raw/master/software/kvm/software.cfg # PyPi servers from new host since some time and change is not incorporated in extended KVM SR allow-hosts += -- 2.30.9 From 4e42a7b42d8347fbd0a0ad0234d2d3c4f4c26aca Mon Sep 17 00:00:00 2001 From: Ivan Tyagov Date: Wed, 10 Jul 2019 13:57:34 +0300 Subject: [PATCH 2/2] WIP: provide a fallback in case missing. --- software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg | 2 +- software/erp5testnode/testsuite/deploy-test/instance.cfg.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg b/software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg index 037efcd8a1..1c37bfa27c 100644 --- a/software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg +++ b/software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg @@ -18,4 +18,4 @@ md5sum = f0f5dd379361eb37f84e0bc7639f645f [template-deploy-test] filename = instance.cfg.in -md5sum = 616abb7fb4608321e11ade0a43b0ce4b +md5sum = 26d527e5542e6ef90f35efce1ec57e77 diff --git a/software/erp5testnode/testsuite/deploy-test/instance.cfg.in b/software/erp5testnode/testsuite/deploy-test/instance.cfg.in index 750740fd9c..3c4d19eadc 100644 --- a/software/erp5testnode/testsuite/deploy-test/instance.cfg.in +++ b/software/erp5testnode/testsuite/deploy-test/instance.cfg.in @@ -29,7 +29,7 @@ rendered = $${buildout:directory}/bin/$${:_buildout_section_name_} template = inline: #!/bin/sh 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')}}" --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 = key slapparameter_dict slap-configuration:configuration -- 2.30.9