Update slapos-testing to use updated egg_test recipe.

It currently tests slapos.core, slapos.recipe.build, slapos.recipe.template.

software/slapos-testing/instance.cfg

@@ -6,15 +6,16 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[download-source]
-recipe = plone.recipe.command
-location = $${rootdirectory:source-code}/$${:_buildout_section_name_}
-stop-on-error = true
-branch = master
-revision =
-command = "${git:location}/bin/git" clone --quiet --branch "$${:branch}" "$${:repository}" "$${:location}" && if [ -n "$${:revision}" ]; then cd "$${:location}" && "${git:location}/bin/git" reset --quiet --hard "$${:revision}" ; fi
-update-command = cd "$${:location}" && "${git:location}/bin/git" fetch && if [ -n "$${:revision}" ]; then "${git:location}/bin/git" reset --hard "$${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
+[create-directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+services = $${:etc}/run
+srv = $${buildout:directory}/srv
+source-code = $${:srv}/eggs-source-code
 
+[download-source]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
 
 # Local development
 [slapos.core]
@@ -25,22 +26,25 @@ repository = ${slapos.core-repository:location}
 <= download-source
 repository = ${slapos.recipe.template-repository:location}
 
+[slapos.recipe.build]
+<= download-source
+repository = ${slapos.recipe.build-repository:location}
+
 [slapos-test-runner]
 recipe = slapos.cookbook:egg_test
-
 run-test-suite = $${buildout:bin-directory}/runTestSuite
-
 run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-
 # The list of executables should be defined here and a combination
 # of tests should dynamically generated.
 #python-list = $${}
-
-test-list = $${slapos.recipe.template:location},$${slapos.core:location}
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-srv = $${buildout:directory}/srv
-source-code = $${:srv}/eggs-source-code
-bin = $${buildout:directory}/bin
+test-list =
+  $${slapos.core:location}
+  $${slapos.recipe.template:location}
+  $${slapos.recipe.build:location}
+prepend-path = ${libxslt:location}/bin:${python2.7:location}/bin
+environment = environment
+
+[environment]
+CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
+LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
+PYTHONPATH = ${setuptools:location}

software/slapos-testing/software.cfg

-
 [buildout]
-extends = ../../stack/slapos.cfg
-          ../../component/lxml-python/buildout.cfg
+
+extends =
   ../../component/git/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/libxml2/buildout.cfg
+  ../../component/libxslt/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/setuptools/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  ../../stack/slapos.cfg
 
-parts = erp5.util-repository
+parts =
   slapos.cookbook-repository
-        runTestSuite
-        eggs
   slapos.core-repository
   slapos.recipe.template-repository
+  slapos.recipe.build-repository
+  eggs
   template
 
-develop = ${buildout:parts-directory}/erp5.util-repository
-          ${buildout:parts-directory}/slapos.cookbook-repository
-
-[erp5.util-repository]
-<= download-source
-repository = http://git.erp5.org/repos/erp5.git
-branch = master
-
-[slapos.cookbook-repository]
-<= download-source
-repository = http://git.erp5.org/repos/slapos.git
-branch = slapos-testing
-
 [eggs]
 recipe = zc.recipe.egg
 eggs = 
   ${lxml-python:egg}
-  slapos.cookbook
-
-[runTestSuite]
-recipe = zc.recipe.egg
-
-eggs = 
   erp5.util
-
+  slapos.cookbook
 entry-points =
   runTestSuite=erp5.util.testsuite:runTestSuite
-
 scripts =
   runTestSuite
 
-[download-source]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+[erp5.util-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/erp5.git
 branch = master
-revision =
-command = "${git:location}/bin/git" clone --quiet --branch "${:branch}" "${:repository}" "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
-update-command = cd "${:location}" && "${git:location}/bin/git" fetch && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
+
+[slapos.cookbook-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 = slapos-testing
 
 [slapos.core-repository]
-<= download-source
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
 repository = http://git.erp5.org/repos/slapos.core.git
+branch = master
 
 [slapos.recipe.template-repository]
-<= download-source
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
 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
+repository = http://git.erp5.org/repos/slapos.recipe.build.git
+branch = master
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = d2a167a6441d5170a027b3771932fe7f 
+md5sum = d233cfac7c71e8b8fa4bd9f1a7fe58ee 
 output =  ${buildout:directory}/template.cfg
 mode = 640