diff --git a/software/slapos-testing/instance.cfg b/software/slapos-testing/instance.cfg index 7762bb7a8fd1c0af1fba65fb721cd25d10479362..82add14351230f835256d3aac2bf6aa66c0e6e8f 100644 --- a/software/slapos-testing/instance.cfg +++ b/software/slapos-testing/instance.cfg @@ -1,5 +1,6 @@ [buildout] -parts = +parts = + slapos.core-setup slapos-test-runner sh-environment @@ -24,6 +25,12 @@ git-executable = ${git:location}/bin/git <= download-source repository = ${slapos.core-repository:location} +[slapos.core-setup] +recipe = plone.recipe.command +command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n +update-command = $${:command} + + [slapos.recipe.template] <= download-source repository = ${slapos.recipe.template-repository:location} diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg index 5d7f5c2d26e2ebe82ef8a1f3c62e45aa8f49f603..f5681c07e58cb0c273f9a3a0054edfc2cce49fb8 100644 --- a/software/slapos-testing/software.cfg +++ b/software/slapos-testing/software.cfg @@ -25,6 +25,7 @@ eggs = erp5.util slapos.cookbook collective.recipe.template + plone.recipe.command entry-points = runTestSuite=erp5.util.testsuite:runTestSuite scripts = @@ -61,7 +62,7 @@ branch = master [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = 7a8be25961238f8e11d5de95d2f05598 +md5sum = 1330c8ccd1dab485aadba5e688d2b2e1 output = ${buildout:directory}/template.cfg mode = 640 @@ -106,7 +107,6 @@ Werkzeug = 0.9.4 buildout-versions = 1.7 cmd2 = 0.6.7 collective.recipe.template = 1.10 -erp5.util = 0.4.36 itsdangerous = 0.23 lxml = 3.3.0beta3 meld3 = 0.6.10 @@ -130,6 +130,8 @@ bpython = 0.12 # slapos.core==1.0.0 cliff = 1.5.2 +erp5.util = 0.4.36 + # Required by: # slapos.cookbook==0.85 inotifyx = 0.2.0-1