fixup! software/erp5testnode: deploy-test use latest kvm

adjust to changes in kvm software release and erp5.util

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

@@ -18,4 +18,4 @@ md5sum = 8288e59eb442c662544daffbf446a033
 
 [template-deploy-test]
 filename = instance.cfg.in
-md5sum = b673c497abe5b3e7de4c7fc8b01aa3d0
+md5sum = c5db797980951b764b69aaa4b60a0380

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

@@ -28,7 +28,7 @@ recipe = slapos.recipe.template:jinja2
 rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
 template = inline:
   #!/bin/sh
-  export PATH=${python-with-eggs:location}:$PATH
+  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} "$@"
 mode = 0755
 context =
@@ -37,7 +37,7 @@ context =
 
 [switch_softwaretype]
 default = $${:deploy-test}
-deploy-test = $${dynamic-template-deploy-test:rendered}
+deploy-test = dynamic-template-deploy-test:rendered
 
 [dynamic-template-deploy-test]
 recipe = slapos.recipe.template:jinja2

software/erp5testnode/testsuite/deploy-test/runTestSuite.py

@@ -152,9 +152,12 @@ def main():
 
   revision = args.revision
   test_suite_title = args.test_suite_title or args.test_suite
+  # TODO: rewrite this unsing nxdtest, EggTestSuite no longer exist in erp5.util
   suite = testsuite.EggTestSuite(
       1, test_suite=args.test_suite, node_quantity=args.node_quantity,
       python_interpreter=args.python_interpreter,
+      shared_part_list=os.environ.get('SLAPOS_TEST_SHARED_PART_LIST', ''),
+      log_directory=os.environ.get('SLAPOS_TEST_LOG_DIRECTORY', ''),
       egg_test_path_dict={
           os.path.basename(os.path.normpath(path)): path
           for path in args.test_location.split(',')},

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

@@ -2,9 +2,8 @@
 extends =
   buildout.hash.cfg
   https://lab.nexedi.com/nexedi/slapos/raw/1.0.182/software/kvm/software.cfg
-
 parts =
-  eggs
+  python-with-eggs
   template-deploy-test
   runTestSuite_py
   playbook
@@ -15,7 +14,9 @@ eggs =
   erp5.util
 interpreter = ${:_buildout_section_name_}
 
-[python-with-eggs]
+[python2.7-with-eggs]
+# create interpreters named "python" and "python2.7" so that
+# instance profile can use them in $PATH
 recipe = plone.recipe.command
 
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -23,8 +24,8 @@ stop-on-error = true
 command =
   rm -fr ${:location} &&
   mkdir -p ${:location} &&
-  ln -s ${buildout:bin-directory}/pythonwitheggs ${:location}/python &&
-  ln -s ${buildout:bin-directory}/pythonwitheggs ${:location}/python2.7
+  ln -s ${buildout:bin-directory}/${python-with-eggs:interpreter} ${:location}/python &&
+  ln -s ${buildout:bin-directory}/${python-with-eggs:interpreter} ${:location}/python2.7
 update-command = ${:command}
 
 [playbook]