Merge remote-tracking branch 'origin/master' into erp5-component

software/erp5-util-testing/instance.cfg

 [buildout]
 parts =
+  erp5-util-setup
   test-runner
   sh-environment
 
@@ -24,6 +25,11 @@ git-executable = ${git:location}/bin/git
 <= download-source
 repository = ${erp5-util-repository:location}
 
+[erp5-util-setup]
+recipe = plone.recipe.command
+command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
+update-command = $${:command}
+
 [test-runner]
 recipe = slapos.cookbook:egg_test
 run-test-suite = $${create-directory:bin}/runTestSuite

software/erp5-util-testing/software.cfg

@@ -45,7 +45,7 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = e8b87313667c944567029c61c9c0bd2e
+md5sum = 194278f0a65d692bd165a909e6c83148
 output =  ${buildout:directory}/template.cfg
 mode = 640
 

software/slapos-testing/instance.cfg

 [buildout]
 parts =
+  slapos.core-setup
   slapos-test-runner
   sh-environment
 
@@ -24,6 +25,12 @@ git-executable = ${git:location}/bin/git
 <= download-source
 repository = ${slapos.core-repository:location}
 
+[slapos.core-setup]
+recipe = plone.recipe.command
+command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n 
+update-command = $${:command}
+
+
 [slapos.recipe.template]
 <= download-source
 repository = ${slapos.recipe.template-repository:location}

software/slapos-testing/software.cfg

@@ -25,6 +25,7 @@ eggs =
   erp5.util
   slapos.cookbook
   collective.recipe.template
+  plone.recipe.command
 entry-points =
   runTestSuite=erp5.util.testsuite:runTestSuite
 scripts =
@@ -61,7 +62,7 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 7a8be25961238f8e11d5de95d2f05598
+md5sum = 1330c8ccd1dab485aadba5e688d2b2e1
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
@@ -106,7 +107,6 @@ Werkzeug = 0.9.4
 buildout-versions = 1.7
 cmd2 = 0.6.7
 collective.recipe.template = 1.10
-erp5.util = 0.4.36
 itsdangerous = 0.23
 lxml = 3.3.0beta3
 meld3 = 0.6.10
@@ -130,6 +130,8 @@ bpython = 0.12
 # slapos.core==1.0.0
 cliff = 1.5.2
 
+erp5.util = 0.4.36
+
 # Required by:
 # slapos.cookbook==0.85
 inotifyx = 0.2.0-1

stack/erp5/buildout.cfg

@@ -141,7 +141,7 @@ parts =
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = erp5
+branch = erp5-component
 git-executable = ${git:location}/bin/git
 
 [check-recipe]
@@ -333,7 +333,7 @@ repository_id_list = erp5
 [erp5]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
-branch = master
+branch = erp5-component
 git-executable = ${git:location}/bin/git
 
 [fix-products-paths]