Commit 69458bf5 authored by Jérome Perrin's avatar Jérome Perrin Committed by Julien Muchembled

slapos-testing: add slapos.rebootstrap to tested eggs

/reviewed-on !693
parent f93ec7e3
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = b48db2861644d9e9c30d2652c100d70e md5sum = 47eb5f8e6f56729e2ce0e6213bccf4f7
...@@ -66,6 +66,10 @@ repository = ${slapos.recipe.template-repository:location} ...@@ -66,6 +66,10 @@ repository = ${slapos.recipe.template-repository:location}
<= download-source <= download-source
repository = ${slapos.toolbox-repository:location} repository = ${slapos.toolbox-repository:location}
[slapos.rebootstrap]
<= download-source
repository = ${slapos.rebootstrap-repository:location}
[slapos-test-runner] [slapos-test-runner]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -73,7 +77,7 @@ wrapper-path = $${create-directory:bin}/runTestSuite ...@@ -73,7 +77,7 @@ wrapper-path = $${create-directory:bin}/runTestSuite
command-line = command-line =
${buildout:bin-directory}/runTestSuite ${buildout:bin-directory}/runTestSuite
--python_interpreter=${buildout:bin-directory}/${eggs:interpreter} --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
--source_code_path_list=$${kedifa:location},$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location},$${slapos.libnetworkcache:location} --source_code_path_list=$${kedifa:location},$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location},$${slapos.libnetworkcache:location},$${slapos.rebootstrap:location}
# Notes about environment: # Notes about environment:
# * slapos.cookbook:wrapper does not seem to allow "extending" PATH. Tests # * slapos.cookbook:wrapper does not seem to allow "extending" PATH. Tests
......
...@@ -89,6 +89,10 @@ egg = slapos.toolbox ...@@ -89,6 +89,10 @@ egg = slapos.toolbox
setup = ${slapos.toolbox-repository:location} setup = ${slapos.toolbox-repository:location}
depends = ${slapos.core-setup:egg} depends = ${slapos.core-setup:egg}
[slapos.rebootstrap-setup]
<= setup-develop-egg
egg = slapos.rebootstrap[test]
setup = ${slapos.rebootstrap-repository:location}
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -109,6 +113,7 @@ eggs = ...@@ -109,6 +113,7 @@ eggs =
${slapos.recipe.template-setup:egg} ${slapos.recipe.template-setup:egg}
${slapos.toolbox-setup:egg} ${slapos.toolbox-setup:egg}
${slapos.libnetworkcache-setup:egg} ${slapos.libnetworkcache-setup:egg}
${slapos.rebootstrap-setup:egg}
mock mock
zope.testing zope.testing
httmock httmock
...@@ -176,6 +181,9 @@ repository = https://lab.nexedi.com/nexedi/slapos.recipe.cmmi.git ...@@ -176,6 +181,9 @@ repository = https://lab.nexedi.com/nexedi/slapos.recipe.cmmi.git
<= git-clone-repository <= git-clone-repository
repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
[slapos.rebootstrap-repository]
<= git-clone-repository
repository = https://lab.nexedi.com/nexedi/slapos.rebootstrap.git
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
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