Merge branch 'agent'

software/agent/instance-agent.cfg

@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+run = $${:etc}/run
+agentlog = $${buildout:directory}/var/log/agent
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
+
 [instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
+recipe = slapos.cookbook:agent
 agent_binary = ${buildout:directory}/bin/agent
 pidfile = $${directory:srv}/agent.pid
 log = $${directory:agentlog}/agent.log
@@ -21,11 +31,3 @@ default_max_install_duration =  $${slap-parameter:default_max_install_duration}
 default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration}
 default_max_request_duration = $${slap-parameter:default_max_request_duration}
 default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-run = $${:etc}/run
-agentlog = $${buildout:directory}/var/log/agent
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin

software/agent/software.cfg

@@ -12,52 +12,32 @@ parts =
   template
   template-agent
   slapos.cookbook-repository
-  check-recipe
   slapos.toolbox-repository
-  check-recipe-toolbox
-  instance-recipe-egg
+  check-recipe
+  slapos-cookbook
   script
 
 # Local development
 [slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
 branch = agent
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
-recipe = plone.recipe.command
-stop-on-error = true
-branch = agent
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.toolbox.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = agent3
+git-executable = ${git:location}/bin/git
+
 
-[check-recipe-toolbox]
+[check-recipe]
 recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
-
-[instance-recipe]
-# XXX-Cedric: it can use newest slapos.cfg to not have duplication
-egg = slapos.cookbook
-module = agent
-
-[instance-recipe-egg]
-# XXX-Cedric: it can use newest slapos.cfg to not have duplication
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  ${instance-recipe:egg}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link;
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
 
 [template]
 recipe = slapos.recipe.template
@@ -70,7 +50,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-agent.cfg
 output = ${buildout:directory}/template-agent.cfg
-md5sum = fd9670d8473be402b10990398b553b00
+md5sum = 7c5c43eb98d5a11961d72fce97a8e67b
 mode = 0644
 
 [script]