XXX run a with this slapos.cookbook

software/slapos-sr-testing/software.cfg

@@ -30,6 +30,11 @@ recipe = zc.recipe.egg:develop
 egg = slapos.cookbook[test]
 setup = ${slapos-repository:location}/
 
+; Don't setup develop twice
+[slapos-cookbook-develop]
+recipe =
+setup =
+
 [slapos.test.backupserver-setup]
 <= setup-develop-egg
 egg = slapos.test.backupserver

software/slapos-testing/software.cfg

@@ -22,6 +22,12 @@ parts =
   phantomjs
   template
 
+; Don't setup develop twice
+[slapos-cookbook-develop]
+recipe =
+setup =
+
+
 [bootstrap-slapos.recipe.cmmi]
 # install our develop version of slapos.recipe.cmmi before anything else,
 # otherwise it will be installed from pypi by dependencies.

stack/slapos.cfg

@@ -79,7 +79,7 @@ networkcache-section = networkcache
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/slapos.git
-branch = master
+branch = feat/switch_software_type_in_same_process
 git-executable = ${git:location}/bin/git
 
 [slapos-cookbook-develop]
@@ -90,7 +90,9 @@ setup = ${slapos.cookbook-repository:location}
 [slapos-cookbook]
 recipe = zc.recipe.egg
 eggs = slapos.cookbook
-depends = ${slapos-cookbook-dependencies:eggs}
+depends =
+  ${slapos-cookbook-dependencies:eggs}
+  ${slapos-cookbook-develop:recipe}
 
 [slapos-cookbook-dependencies]
 recipe = zc.recipe.egg