.

component/pygolang/test.cfg

@@ -36,9 +36,14 @@ template = inline:
 
 
 [instance.cfg]
-<= nxdtest-instance.cfg
-env.sh  = ${pygolang-env.sh:rendered}
-workdir = ${pygolang-repository:location}
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${pygolang-env.sh:rendered}
+  workdir = ${pygolang-repository:location}
 
 
 [versions]

software/neotest/software.cfg

@@ -77,14 +77,6 @@ mode    = 0755
 
 
 # instance
-[jinja2-template]
-recipe  = slapos.recipe.template:jinja2
-template= ${:_profile_base_location_}/${:filename}
-rendered= ${buildout:directory}/${:_buildout_section_name_}
-mode    = 0644
-context =
-  section buildout  buildout
-
 [instance.cfg]
 <= jinja2-template
 template = inline:
@@ -121,6 +113,8 @@ eggs    =
     ${ZEO:egg}
 # for e.g. tcpu.py
     ${pygolang:egg}
+# for instance
+    plone.recipe.command
 
 
 # wendelin.core: latest not yet released
@@ -147,3 +141,5 @@ zc.lockfile = 1.2.1
 # Required by:
 # neoppod==1.8.1
 python-dateutil = 2.7.1
+
+# XXX plone.recipe.command =

stack/nxdtest.cfg

@@ -15,12 +15,18 @@ extends =
     ../component/git/buildout.cfg
     nxdtest/buildout.hash.cfg
 
+[jinja2-template]
+recipe   = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+mode     = 0644
+context  =
+  section buildout  buildout
+
 [nxdtest-instance.cfg]
-recipe  = slapos.recipe.template:jinja2
-template= ${:_profile_base_location_}/nxdtest/${:filename}
-rendered= ${buildout:directory}/${:_buildout_section_name_}
-mode    = 0644
-context =
+<= jinja2-template
+template = ${:_profile_base_location_}/nxdtest/${:filename}
+context +=
   section buildout  buildout
   section nxdtest   nxdtest
 # key     env_sh    :env.sh