slapos-testing: install released versions of s.r.cmmi & s.r.build

software/slapos-testing/software.cfg

@@ -14,17 +14,10 @@ extends =
   ./buildout.hash.cfg
 
 parts =
-  bootstrap-slapos.recipe.cmmi
   eggs
   phantomjs
   template
 
-[bootstrap-slapos.recipe.cmmi]
-# install our develop version of slapos.recipe.cmmi before anything else,
-# otherwise it will be installed from pypi by dependencies.
-recipe = zc.recipe.egg
-eggs = ${slapos.recipe.cmmi-setup:egg}
-
 [setup-develop-egg]
 recipe = zc.recipe.egg:develop
 
@@ -53,16 +46,16 @@ depends = ${slapos.core-setup:egg}
 egg = slapos.core
 setup = ${slapos.core-repository:location}
 
-[slapos.recipe.build-setup]
-<= setup-develop-egg
-egg = slapos.recipe.build[test]
-setup = ${slapos.recipe.build-repository:location}
+#[slapos.recipe.build-setup]
+#<= setup-develop-egg
+#egg = slapos.recipe.build[test]
+#setup = ${slapos.recipe.build-repository:location}
 
-[slapos.recipe.cmmi-setup]
-<= setup-develop-egg
-egg = slapos.recipe.cmmi[test]
-setup = ${slapos.recipe.cmmi-repository:location}
-depends = ${slapos.recipe.build-setup:egg}
+#[slapos.recipe.cmmi-setup]
+#<= setup-develop-egg
+#egg = slapos.recipe.cmmi[test]
+#setup = ${slapos.recipe.cmmi-repository:location}
+#depends = ${slapos.recipe.build-setup:egg}
 
 [slapos.recipe.template-setup]
 <= setup-develop-egg
@@ -80,6 +73,8 @@ depends = ${slapos.core-setup:egg}
 
 [eggs]
 recipe = zc.recipe.egg
+# For bootstrap issues, we install software using the released version of
+# slapos.recipe.cmmi ( and slapos.recipe.build which is a dependency )
 eggs =
   ${lxml-python:egg}
   ${python-cryptography:egg}
@@ -91,8 +86,8 @@ eggs =
   ${erp5.util-setup:egg}
   ${slapos.cookbook-setup:egg}
   ${slapos.core-setup:egg}
-  ${slapos.recipe.build-setup:egg}
-  ${slapos.recipe.cmmi-setup:egg}
+  slapos.recipe.build
+  slapos.recipe.cmmi
   ${slapos.recipe.template-setup:egg}
   ${slapos.toolbox-setup:egg}
   mock
@@ -166,7 +161,7 @@ caucase =
 erp5.util =
 slapos.cookbook =
 slapos.core =
-slapos.recipe.build =
-slapos.recipe.cmmi =
+#slapos.recipe.build =
+#slapos.recipe.cmmi =
 slapos.recipe.template =
 slapos.toolbox =