Commit fda4e56c authored by Jérome Perrin's avatar Jérome Perrin

XXX run a with this slapos.cookbook

parent 7132161a
...@@ -30,6 +30,11 @@ recipe = zc.recipe.egg:develop ...@@ -30,6 +30,11 @@ recipe = zc.recipe.egg:develop
egg = slapos.cookbook[test] egg = slapos.cookbook[test]
setup = ${slapos-repository:location}/ setup = ${slapos-repository:location}/
; Don't setup develop twice
[slapos-cookbook-develop]
recipe =
setup =
[slapos.test.backupserver-setup] [slapos.test.backupserver-setup]
<= setup-develop-egg <= setup-develop-egg
egg = slapos.test.backupserver egg = slapos.test.backupserver
......
...@@ -22,6 +22,12 @@ parts = ...@@ -22,6 +22,12 @@ parts =
phantomjs phantomjs
template template
; Don't setup develop twice
[slapos-cookbook-develop]
recipe =
setup =
[bootstrap-slapos.recipe.cmmi] [bootstrap-slapos.recipe.cmmi]
# install our develop version of slapos.recipe.cmmi before anything else, # install our develop version of slapos.recipe.cmmi before anything else,
# otherwise it will be installed from pypi by dependencies. # otherwise it will be installed from pypi by dependencies.
......
...@@ -79,7 +79,7 @@ networkcache-section = networkcache ...@@ -79,7 +79,7 @@ networkcache-section = networkcache
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = feat/switch_software_type_in_same_process
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[slapos-cookbook-develop] [slapos-cookbook-develop]
...@@ -90,7 +90,9 @@ setup = ${slapos.cookbook-repository:location} ...@@ -90,7 +90,9 @@ setup = ${slapos.cookbook-repository:location}
[slapos-cookbook] [slapos-cookbook]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = slapos.cookbook eggs = slapos.cookbook
depends = ${slapos-cookbook-dependencies:eggs} depends =
${slapos-cookbook-dependencies:eggs}
${slapos-cookbook-develop:recipe}
[slapos-cookbook-dependencies] [slapos-cookbook-dependencies]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
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