testnode: build firefox & xvfb as part of testnode

(Another patch to erp5.util is needed)

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -24,6 +24,8 @@ software_link = %(software_link)s
 git_binary = %(git_binary)s
 slapos_binary = %(slapos_binary)s
 zip_binary = %(zip_binary)s
+firefox_binary = %(firefox_binary)s
+xvfb_binary = %(xvfb_binary)s
 
 [environment]
 PATH = %(PATH)s

software/erp5testnode/instance-default.cfg

@@ -44,6 +44,8 @@ git-binary = ${git:location}/bin/git
 slapos-binary = ${buildout:bin-directory}/slapos
 testnode = ${buildout:bin-directory}/testnode
 zip-binary = ${zip:location}/bin/zip
+firefox-binary = ${firefox:location}/firefox-slapos
+xvfb-binary = ${xserver:location}/bin/Xvfb
 httpd-pid-file = $${basedirectory:run}/httpd.pid
 httpd-lock-file = $${basedirectory:run}/httpd.lock
 httpd-conf-file = $${rootdirectory:etc}/httpd.conf

software/erp5testnode/software.cfg

@@ -14,6 +14,8 @@ extends =
   ../../component/inkscape/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/libreoffice-bin/buildout.cfg
+  ../../component/xorg/buildout.cfg
+  ../../component/firefox/buildout.cfg
 
 parts =
   slapos-cookbook-develop
@@ -65,6 +67,12 @@ input = inline:
   [libreoffice-bin]
   recipe =
   location = ${libreoffice-bin:location}
+  [xserver]
+  recipe =
+  location = ${xserver:location}
+  [firefox]
+  recipe =
+  location = ${firefox:location}
 
 
 [erp5-util-repository.git]
@@ -137,7 +145,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = 1b45db053e3c7a65e5e802e4aadc42da
+md5sum = 3c45209d04a3f67f999c2b45cd2f103f
 
 [versions]
 erp5.util =