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

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

This reverts commit 90f29b1a and
subsequent fixups.

This partial revert was made in a rush without clear understanding
of the problem. Reverting the partial revert to apply proper fixes.

software/erp5testnode/testsuite/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template-erp5testnode]
 filename = instance.cfg.in
-md5sum = bbfe2f0e83df4d6cd2120c0ef3c483cd
+md5sum = 681f4159e4ac2542d0fbc7a894e43d79

software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 8357771b70efd0740561b1cb46f6955e
 
 [template-deploy-test]
 filename = instance.cfg.in
-md5sum = cdd74e3dbb36a737ed9cef1e055b74b0
+md5sum = 9013ba5a4a2c80c7d96d0a6bfe0be0be

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

@@ -25,8 +25,8 @@ command =
 
 [runTestSuite]
 recipe = slapos.recipe.template:jinja2
-rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
-template = inline:
+output = $${buildout:directory}/bin/$${:_buildout_section_name_}
+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:rendered
+deploy-test = dynamic-template-deploy-test:output
 
 [dynamic-template-deploy-test]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
-rendered = $${buildout:directory}/template-deploy-test.cfg
+url = ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
+output = $${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:rendered
+test = dynamic-template-resilient-test:output
 
 [dynamic-template-resilient-test]
 recipe = slapos.recipe.template:jinja2
-template = ${template-resilient-test:target}
-rendered = $${buildout:directory}/template-resilient-test.cfg
+url = ${template-resilient-test:target}
+output = $${buildout:directory}/template-resilient-test.cfg
 bin-directory = ${buildout:bin-directory}
 context =
     key develop_eggs_directory buildout:develop-eggs-directory

software/slapos-sr-testing/software.cfg

@@ -332,7 +332,7 @@ output = ${buildout:directory}/template.cfg
 context =
   section buildout buildout
   import os os
-  key nxdtest_instance nxdtest-instance.cfg:rendered
+  key nxdtest_instance nxdtest-instance.cfg:output
   key git_location git:location
   key slapos_location slapos-repository:location
   key interpreter python-interpreter:interpreter

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = b64e5d56ccbf08adcddd75e99d2b61e6
+md5sum = 850dedff7af48a70208361cabf688724

software/slapos-testing/instance.cfg

 [buildout]
-extends = ${nxdtest-instance.cfg:rendered}
+extends = ${nxdtest-instance.cfg:output}
 parts +=
   publish
 

stack/nxdtest.cfg

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