Commit 29df4d20 authored by Jérome Perrin's avatar Jérome Perrin

slapos-testing: install slapos and supervisor scripts

and make sure we really use the develop version, by clearing version pin
that might be for another version.

Also clean up comments in version section.

This will be needed for standalone tests.
parent 09f3342e
......@@ -15,5 +15,5 @@
[template]
filename = instance.cfg
md5sum = c7becd2a66b3305406f965b969907d52
md5sum = b48db2861644d9e9c30d2652c100d70e
......@@ -84,7 +84,7 @@ command-line =
# guarantee about free ports on IPV4 and IPV6
# * LOCAL_IPV4 is backward compatible, to be migrated, SLAPOS_TEST_IPV4
environment =
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:/usr/bin/:/bin/
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
......
......@@ -114,10 +114,13 @@ eggs =
zope.testing
httmock
pyflakes
supervisor
entry-points =
runTestSuite=erp5.util.testsuite:runTestSuite
scripts =
runTestSuite
slapos
supervisord
interpreter=
python_for_test
......@@ -182,11 +185,14 @@ output = ${buildout:directory}/template.cfg
mode = 640
[versions]
Pygments = 2.1.3
slapos.recipe.template = 4.3
# clear version pins of tested eggs for which we want to generate scripts
# otherwise, the scripts will be generated for the pinned version.
slapos.core =
erp5.util =
# All depencies should be pinned.
Pygments = 2.1.3
slapos.recipe.template = 4.3
zc.lockfile = 1.4
bcrypt = 3.1.4
dnspython = 1.15.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment