stack/ndtest,software/erp5testnode/testsuite: partially revert...

stack/ndtest,software/erp5testnode/testsuite: partially revert f5ebda78

These were actually :jinja2 versions of the recipe, so we can not
change them like this.

This commit was made in a rush to repair tests failing in loop, there
might still be mistakes.

software/erp5testnode/testsuite/deploy-test/instance.cfg.in

@@ -25,8 +25,8 @@ command =
 
 [runTestSuite]
 recipe = slapos.recipe.template:jinja2
-output = $${buildout:directory}/bin/$${:_buildout_section_name_}
-inline =
+rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
+template = inline:
   #!/bin/sh
   export PATH=${python2.7-with-eggs:location}:$PATH
   exec ${buildout:bin-directory}/${runTestSuite_py:interpreter} ${:_profile_base_location_}/runTestSuite.py --partition_ipv4 {{ list(partition_ipv4)[0] }} --partition_path $${buildout:directory} --test_reference "{{ slapparameter_dict.get('image-to-test-url') }} {{ slapparameter_dict.get('script-to-test-url')}}" --test_location "${test-location:base}/{{ slapparameter_dict.get('test-relative-directory', 'playbook/roles/standalone-shared') }}" --python_interpreter=${buildout:bin-directory}/${runTestSuite_py:interpreter} "$@"
@@ -36,12 +36,12 @@ context =
 
 [switch_softwaretype]
 default = $${:deploy-test}
-deploy-test = dynamic-template-deploy-test:output
+deploy-test = dynamic-template-deploy-test:rendered
 
 [dynamic-template-deploy-test]
 recipe = slapos.recipe.template:jinja2
-url = ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
-output = $${buildout:directory}/template-deploy-test.cfg
+template = ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
+rendered = $${buildout:directory}/template-deploy-test.cfg
 context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory

software/erp5testnode/testsuite/instance.cfg.in

@@ -6,12 +6,12 @@ default = $${:test}
 RootSoftwareInstance = $${:test}
 
 # Used for the test of resiliency. The system wants a "test" software_type.
-test = dynamic-template-resilient-test:output
+test = dynamic-template-resilient-test:rendered
 
 [dynamic-template-resilient-test]
 recipe = slapos.recipe.template:jinja2
-url = ${template-resilient-test:target}
-output = $${buildout:directory}/template-resilient-test.cfg
+template = ${template-resilient-test:target}
+rendered = $${buildout:directory}/template-resilient-test.cfg
 bin-directory = ${buildout:bin-directory}
 context =
     key develop_eggs_directory buildout:develop-eggs-directory

stack/nxdtest.cfg

@@ -18,9 +18,9 @@
 #
 #    [instance.cfg]
 #    <= jinja2-template
-#    inline =
+#    template = inline:
 #      [buildout]
-#      extends = ${nxdtest-instance.cfg:output}
+#      extends = ${nxdtest-instance.cfg:rendered}
 #
 #      [runTestSuite]
 #      env.sh  = ...
@@ -37,15 +37,15 @@ extends =
 
 [jinja2-template]
 recipe   = slapos.recipe.template:jinja2
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/${:_buildout_section_name_}
+template = ${:_profile_base_location_}/${:filename}
+rendered = ${buildout:directory}/${:_buildout_section_name_}
 mode     = 0644
 context  =
   section buildout  buildout
 
 [nxdtest-instance.cfg]
 <= jinja2-template
-url = ${:_profile_base_location_}/nxdtest/${:filename}
+template = ${:_profile_base_location_}/nxdtest/${:filename}
 # NOTE += does not work
 context =
   section buildout  buildout