Commit 5b1120ec authored by Jérome Perrin's avatar Jérome Perrin

slapos-testing: go back to using another working copy in the instance

this is needed because the test needs to execute `python setup.py
test` within a directory containing the tested egg.

The instance working copy is a git clone from the software working copy,
so it should be using the same revision.
parent ec27f6b9
...@@ -16,5 +16,5 @@ ...@@ -16,5 +16,5 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 812f9b34c2e02036a4d639942d3fa1df md5sum = d121cbd59feda8eb0ebe652a04f014c3
...@@ -22,6 +22,43 @@ etc = $${buildout:directory}/etc ...@@ -22,6 +22,43 @@ etc = $${buildout:directory}/etc
services = $${:etc}/run services = $${:etc}/run
srv = $${buildout:directory}/srv srv = $${buildout:directory}/srv
[download-source]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
[caucase]
<= download-source
repository = ${caucase-repository:location}
[erp5.util]
<= download-source
repository = ${erp5.util-repository:location}
[slapos.cookbook]
<= download-source
repository = ${slapos.cookbook-repository:location}
[slapos.core]
<= download-source
repository = ${slapos.core-repository:location}
[slapos.recipe.build]
<= download-source
repository = ${slapos.recipe.build-repository:location}
[slapos.recipe.cmmi]
<= download-source
repository = ${slapos.recipe.cmmi-repository:location}
[slapos.recipe.template]
<= download-source
repository = ${slapos.recipe.template-repository:location}
[slapos.toolbox]
<= download-source
repository = ${slapos.toolbox-repository:location}
[slapos-test-runner] [slapos-test-runner]
recipe = slapos.cookbook:egg_test recipe = slapos.cookbook:egg_test
run-test-suite = $${create-directory:bin}/runTestSuite run-test-suite = $${create-directory:bin}/runTestSuite
...@@ -30,14 +67,14 @@ run-test-suite-binary = ${buildout:bin-directory}/runTestSuite ...@@ -30,14 +67,14 @@ run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
# of tests should dynamically generated. # of tests should dynamically generated.
#python-list = $${} #python-list = $${}
test-list = test-list =
${caucase-repository:location} $${caucase:location}
${erp5.util-repository:location} $${erp5.util:location}
${slapos.cookbook-repository:location} $${slapos.cookbook:location}
${slapos.core-repository:location} $${slapos.core:location}
${slapos.recipe.build-repository:location} $${slapos.recipe.build:location}
${slapos.recipe.cmmi-repository:location} $${slapos.recipe.cmmi:location}
${slapos.recipe.template-repository:location} $${slapos.recipe.template:location}
${slapos.toolbox-repository:location} $${slapos.toolbox:location}
prepend-path = ${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin prepend-path = ${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin
interpreter = ${eggs:interpreter} interpreter = ${eggs:interpreter}
......
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