theia, erp5testnode: switch to python3

theia, erp5testnode are both running a slapos standalone. We don't
change slaprunner to python3 because it's not maintained anymore and
should disappear in the near future.

software/erp5testnode/software.cfg

@@ -22,10 +22,13 @@ parts =
   git
   apache
 
+[python]
+part = python3
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
-  erp5.util[testnode,benchmark,scalability_tester]
+  erp5.util[testnode,benchmark]
   ${lxml-python:egg}
 
 
@@ -47,14 +50,13 @@ PyXML = 0.8.5
 WebOb = 1.8.5
 WebTest = 2.0.33
 soupsieve = 1.8
-#gitdb2 = 2.0.4
-#smmap2 = 2.0.4
 waitress = 1.4.4
-z3c.etestbrowser = 2.0.1
+z3c.etestbrowser = 3.0.1
 zope.testbrowser = 5.3.2
 WSGIProxy2 = 0.4.6
 beautifulsoup4 = 4.7.1
 zope.cachedescriptors = 4.3.1
 zope.event = 4.4
 zope.schema = 4.9.3
-slapos.tool.nosqltester = 0.0.4.dev-r45972
+zope.deferredimport = 4.3.1
+zope.proxy = 4.3.5

software/erp5testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2

@@ -44,7 +44,7 @@ recipe = slapos.cookbook:request
 software-url = ${slap-connection:software-release-url}
 software-type = kvm-resilient
 name = Resilient Instance (Root Instance)
-{% for key, value in slapparameter_dict.get('cluster', {}).iteritems() -%}
+{% for key, value in slapparameter_dict.get('cluster', {}).items() -%}
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}
 config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}

software/erp5testnode/testsuite/instance-resilient-test.cfg.jinja2

@@ -43,7 +43,7 @@ recipe = slapos.cookbook:request
 software-url = ${slap-connection:software-release-url}
 software-type = resilient
 name = Resilient Instance (Root Instance)
-{% for key, value in slapparameter_dict.get('cluster', {}).iteritems() -%}
+{% for key, value in slapparameter_dict.get('cluster', {}).items() -%}
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}
 config-resiliency-backup-periodicity = */10 * * * *

software/erp5testnode/testsuite/kvm.cfg

@@ -12,7 +12,7 @@ md5sum = dd82c771f6f7738fb4b0fc1330ed8236
 
 [template-resilient-test]
 filename = instance-kvm-resilient-test.cfg.jinja2
-md5sum = 71ddbdeb8769bcb0ebb3c9407ef7e36c 
+md5sum = 5f255502973530181ee45d93fa00a3c4
 # Ingest extra-context, on a the final template-resilient-test rendering
 # always ingest raw values.
 extra-context =

software/erp5testnode/testsuite/slaprunner.cfg

@@ -7,7 +7,7 @@ parts += template-erp5testnode
 
 [template-resilient-test]
 filename = instance-resilient-test.cfg.jinja2 
-md5sum = be4adbc196f07f5e39ca78401dfa53ec
+md5sum = e4b04aa6fd3413bc6ae38823abdcc8fa
 
 # We have to use an extra level of indentation here because this is substituted
 # during software buildout to generate instance buildout, but the

software/slapos-sr-testing/software-py3.cfg

@@ -26,3 +26,5 @@ extra =
   headless-chromium ${slapos.test.headless-chromium-setup:setup}
   hugo ${slapos.test.hugo-setup:setup}
   matomo ${slapos.test.matomo-setup:setup}
+  erp5testnode ${slapos.test.erp5testnode-setup:setup}
+  theia ${slapos.test.theia-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -352,7 +352,6 @@ tests =
   fluentd ${slapos.test.fluentd-setup:setup}
   kvm ${slapos.test.kvm-setup:setup}
   slaprunner ${slapos.test.slaprunner-setup:setup}
-  theia ${slapos.test.theia-setup:setup}
   metabase ${slapos.test.metabase-setup:setup}
   erp5 ${slapos.test.erp5-setup:setup}
 ###
@@ -379,7 +378,6 @@ extra =
   jscrawler ${slapos.test.jscrawler-setup:setup}
   html5as ${slapos.test.html5as-setup:setup}
   html5as-base ${slapos.test.html5as-base-setup:setup}
-  erp5testnode ${slapos.test.erp5testnode-setup:setup}
   beremiz-ide ${slapos.test.beremiz-ide-setup:setup}
 
 [versions]

software/theia/software-py3.cfg

-[buildout]
-extends =
-  software.cfg
-
-[python]
-part = python3

software/theia/software.cfg

@@ -37,6 +37,8 @@ shared-part-list =
 
 # Versions
 # --------
+[python]
+part = python3
 
 [gcc]
 # We keep the gcc part in sync with the one from erp5 software, so that when we install

software/theia/test/test.py

@@ -44,8 +44,7 @@ from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass, SlapOSNodeC
 from slapos.grid.svcbackend import getSupervisorRPC, _getSupervisordSocketPath
 
 
-software_cfg = 'software%s.cfg' % ('-py3' if six.PY3 else '')
-theia_software_release_url = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', software_cfg))
+theia_software_release_url = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
 
 setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(theia_software_release_url)
 

stack/slapos.cfg

@@ -223,7 +223,7 @@ atomize = 0.2.0
 croniter = 0.3.25
 dnspython = 1.16.0
 enum34 = 1.1.10
-erp5.util = 0.4.72
+erp5.util = 0.4.73
 feedparser = 5.2.1
 functools32 = 3.2.3.post2
 attrs = 18.2.0