add openvpn, add babel, modify ovpn-client/server

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 106f26c8ac19336ef93112a0e285099a
+md5sum = 073ae67e2d21663fddd638248af0c109

software/slapos-testing/instance.cfg

@@ -86,12 +86,21 @@ repository = ${rubygemsrecipe-repository:location}
 <= download-source
 repository = ${re6stnet-repository:location}
 
+[re6stnet-test-runner]
+recipe = slapos.recipe.template:jinja2
+template = inline:#!/bin/sh
+
+  sed '1s?/usr/bin/python2?${python2.7:location}/bin/python2?' -i ${re6stnet-repository:location}/re6st/ovpn-*
+  mount -t sysfs sysfs /sys
+
+  python -m unittest discover -v
+rendered = $${re6stnet:location}/test-runner.sh
 
 [slapos-test-runner-nxdtest-environment.sh]
 recipe = slapos.recipe.template:jinja2
 rendered = $${create-directory:etc}/$${:_buildout_section_name_}
 template = inline:
-  export PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${jq:location}/bin:${sed:location}/bin:${grep:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${iptables:location}/sbin:${miniupnpd:location}/usr/sbin:${brctl:location}/sbin:${buildout:bin-directory}:$PATH
+  export PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${jq:location}/bin:${sed:location}/bin:${grep:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${iptables:location}/sbin:${miniupnpd:location}/usr/sbin:${brctl:location}/sbin:${openvpn:location}/sbin:${babeld:location}/bin:${buildout:bin-directory}:$PATH
   export SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
   export SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
   export SLAPOS_TEST_EGGS_DIRECTORY=$${buildout:eggs-directory}
@@ -195,7 +204,7 @@ template = inline:
   # )
   TestCase(
       "re6stnet",
-      ['unshare', '-Umnr', 'bash', '-c', 'mount -t sysfs sysfs /sys && python -m unittest discover -v'],
+      ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
       cwd="""$${re6stnet:location}/re6st/tests""",
       summaryf=UnitTest.summary,
   )

software/slapos-testing/software.cfg

@@ -21,6 +21,8 @@ extends =
   ../../component/psycopg2/buildout.cfg
   ../../component/nftables/buildout.cfg
   ../../component/miniupnpd/buildout.cfg
+  ../../component/openvpn/buildout.cfg
+  ../../component/babeld/buildout.cfg
   ../../component/bridge-utils/buildout.cfg
   ../../stack/slapos.cfg
   ../../stack/caucase/buildout.cfg