allow to build slaprunner inside an erp5testnode instance

component/gtk-2/buildout.cfg

@@ -10,7 +10,8 @@ extends =
   ../gettext/buildout.cfg
   ../libtiff/buildout.cfg
   ../libjpeg/buildout.cfg
-    
+  ../perl/buildout.cfg
+
 parts =
   gtk-2
 
@@ -35,6 +36,8 @@ configure-options =
   --disable-static
 # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
 environment = 
+  PERL=${perl:location}/bin/perl
+  PERL5LIB=${perl:location}/lib/${perl:version}
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
   CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
@@ -48,18 +51,22 @@ md5sum = d8ece3a4ade4a91c768328620e473ab8
 configure-options = 
   --disable-static
   --without-libintl-prefix
-environment = 
+environment =
+  PERL=${perl:location}/bin/perl
+  PERL5LIB=${perl:location}/lib/${perl:version}
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
   CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
-  
+
 [atk]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
 md5sum = 87f20b78deaedef858ac54358c0786b1
-environment = 
+environment =
+  PERL=${perl:location}/bin/perl
+  PERL5LIB=${perl:location}/lib/${perl:version}
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
@@ -75,7 +82,9 @@ configure-options =
   --disable-papi
   --enable-explicit-deps
   --disable-xinerama
-environment = 
+environment =
+  PERL=${perl:location}/bin/perl
+  PERL5LIB=${perl:location}/lib/${perl:version}
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
   CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0

slapos/recipe/erp5testnode/__init__.py

@@ -74,6 +74,13 @@ class Recipe(GenericBaseRecipe):
         config_repository_list.set(section_name, 'buildout_section_id',
                                    repository['buildout_section_id'])
       i += 1
+
+    software_path_list = json.loads(self.options['software-path-list'])
+    if software_path_list:
+      CONFIG["software_path_list"] = "[software_list]"
+      CONFIG["software_path_list"] += \
+          "\npath_list = %s" % ",".join(software_path_list)
+
     value = StringIO.StringIO()
     config_repository_list.write(value)
     CONFIG['repository_list'] = value.getvalue()

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

@@ -26,6 +26,8 @@ zip_binary = %(zip_binary)s
 [environment]
 PATH = %(PATH)s
 
+%(software_path_list)s
+
 %(instance_dict)s
 
 %(repository_list)s

software/erp5testnode/instance-default.cfg

@@ -44,7 +44,7 @@ test-suite-master-url = $${slap-parameter:test-suite-master-url}
 bt5-path = $${slap-parameter:additional-bt5-repository-id}
 instance-dict = $${slap-parameter:instance-dict}
 vcs-repository-list = $${slap-parameter:vcs-repository-list}
-
+software-path-list = $${slap-parameter:software-path-list}
 git-binary = ${git:location}/bin/git
 slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp
 slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr
@@ -147,4 +147,5 @@ test-suite-master-url =
 additional-bt5-repository-id =
 instance-dict =
 vcs-repository-list = []
+software-path-list = ["http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5testnode:/software/seleniumrunner/software.cfg"]
 test-suite-title = $${:test-suite}

software/erp5testnode/software.cfg

@@ -51,7 +51,9 @@ eggs =
   slapos.core
   inotifyx
   slapos.cookbook
-  erp5.util[testnode]
+  erp5.util
+
+[testnode]
 
 scripts =
   testnode = erp5.util.testnode:main
@@ -76,7 +78,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = e460e90b20381de10282faeb1dbdb5fc
+md5sum = d37e8af090832012b2066748899113e0
 
 [networkcache]
 # Romain Courteaud + Sebastien Robin + Antoine Catton signature certificate