software/slapos-testing: test re6stnet in python3.11

don't test it in python2 anymore

component/python-nemu3/buildout.cfg

+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+
+[python-nemu3-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+revision = 0301f87d0f7d3e96809cf3c9d38d21248d17515d
+repository = https://lab.nexedi.com/nexedi/nemu3.git
+
+[python-nemu3]
+recipe = zc.recipe.egg:develop
+egg = nemu3
+setup = ${python-nemu3-repository:location}
+
+

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 5f5378550470b551d280dd432878a0ba
+md5sum = fd49b60268a2f58f758c1f4cf81114c2

software/slapos-testing/instance.cfg

@@ -94,8 +94,9 @@ repository = ${re6stnet-repository:location}
 [re6stnet-test-runner]
 recipe = slapos.recipe.template:jinja2
 template = inline:#!/bin/sh
-  #change #!/usr/bin/python2 -> #!/real_python_path/bin/pythonVersion
-  sed '1s?/usr/bin/python2?${python:location}/bin/python${python:version}?' -i ${re6stnet-repository:location}/re6st/ovpn-*
+  # put python3 in PATH for ovpn-server and ovpn-client scripts
+  export PATH=${python:location}/bin:$$PATH
+
   # update files in /sys/class/net
   mount -t sysfs sysfs /sys
 
@@ -120,6 +121,7 @@ output = $${:workdir}/.nxdtest
 workdir = $${create-directory:nxdtest-working-dir}
 inline =
   import six
+  import sys
   TestCase(
       "kedifa",
       ['python', '-m', 'unittest', 'discover', '-v'],
@@ -215,7 +217,7 @@ inline =
       cwd="""$${rubygemsrecipe:location}""",
       summaryf=UnitTest.summary,
   )
-  if six.PY2:
+  if sys.version_info >= (3,11):
     TestCase(
         "re6stnet",
         ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],

software/slapos-testing/software-py2.cfg

@@ -5,10 +5,6 @@ extends =
 # Python2 versions for buildout (keep last)
     ../../stack/slapos-py2.cfg
 
-[extra-eggs]
-eggs +=
-  ${re6stnet-setup:egg}
-
 [slapos.toolbox-setup]
 recipe = zc.recipe.egg
 eggs = ${:egg}

software/slapos-testing/software-py3next.cfg

@@ -4,3 +4,8 @@ extends =
 
 [python3]
 <= python3.11
+
+[extra-eggs]
+eggs +=
+  ${python-nemu3:egg}
+  ${re6stnet-setup:egg}

software/slapos-testing/software.cfg

@@ -9,6 +9,7 @@ extends =
   ../../component/zlib/buildout.cfg
   ../../component/phantomjs/buildout.cfg
   ../../component/pycurl/buildout.cfg
+  ../../component/python-nemu3/buildout.cfg
   ../../component/coreutils/buildout.cfg
   ../../component/socat/buildout.cfg
   ../../component/lmsensors/buildout.cfg
@@ -243,6 +244,7 @@ repository = https://lab.nexedi.com/nexedi/rubygemsrecipe.git
 [re6stnet-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/re6stnet.git
+branch = re6st-py3
 
 [template]
 recipe = slapos.recipe.template
@@ -281,6 +283,7 @@ zope.testing = 4.6.2
 iniparse = 0.5
 miniupnpc = 1.9
 nemu = 0.3.1
+nemu3 = 0.4
 multiping = 1.1.2
 python-passfd = 0.2
 python-unshare = 0.2

stack/slapos.cfg

@@ -387,6 +387,7 @@ typeguard = 3.0.2:whl
 typing-extensions = 4.8.0:whl
 tzlocal = 1.5.1
 unicodecsv = 0.14.1
+unshare = 0.22
 uri-template = 1.2.0
 uritemplate = 4.1.1
 urllib3 = 1.26.12