slapos-testing: Test also slapos.recipe.cmmi

software/slapos-testing/instance.cfg

@@ -44,6 +44,10 @@ repository = ${slapos.recipe.template-repository:location}
 <= download-source
 repository = ${slapos.recipe.build-repository:location}
 
+[slapos.recipe.cmmi]
+<= download-source
+repository = ${slapos.recipe.cmmi-repository:location}
+
 [erp5-util]
 <= download-source
 repository = ${erp5-util-repository:location}
@@ -73,6 +77,7 @@ test-list =
   $${slapos.package:location}
   $${slapos.recipe.template:location}
   $${slapos.recipe.build:location}
+  $${slapos.recipe.cmmi:location}
   $${erp5-util:location}
   $${jio:location}
   $${officejs:location}

software/slapos-testing/software.cfg

@@ -17,6 +17,7 @@ parts =
   slapos.package-repository
   slapos.recipe.template-repository
   slapos.recipe.build-repository
+  slapos.recipe.cmmi-repository
   erp5-util-repository
   officejs-repository
   jio-repository
@@ -37,66 +38,52 @@ entry-points =
 scripts =
   runTestSuite
 
-[slapos.cookbook-repository]
+[git-clone-repository]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
 forbid-download-cache = true
-repository = http://git.erp5.org/repos/slapos.git
 branch = master
 
+[slapos.cookbook-repository]
+<= git-clone-repository
+repository = http://git.erp5.org/repos/slapos.git
+
 [slapos.core-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
 
 [slapos.package-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.package.git
-branch = master
 
 [slapos.recipe.template-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.recipe.template.git
-branch = master
 
 [slapos.recipe.build-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.recipe.build.git
-branch = master
+
+[slapos.recipe.cmmi-repository]
+<= git-clone-repository
+repository = http://git.erp5.org/repos/slapos.recipe.cmmi.git
 
 [erp5-util-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/erp5.git
-branch = master
 
 [officejs-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/officejs.git
-branch = jqs
 
 [jio-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/jio.git
-branch = master
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = b065539ca58a3400b0ed30093ab020ac
+md5sum = eeb79239f685b0cc31d313f726c38d17
 output =  ${buildout:directory}/template.cfg
 mode = 640