Commit 0fe0d2e9 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak

slapos-testing: Provide environment with SLAPOS_TEST_*

Those values are free to be used by tests in order to obtain working
IPv4 and IPv6 addresses.

/reviewed-on !470
parent 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 2af05c83ea9525ac3c6816ee0365876c md5sum = 9c409e1eb2d45713579d65e350bc07e7
...@@ -80,11 +80,14 @@ command-line = ...@@ -80,11 +80,14 @@ command-line =
# needs ping, which is a setuid binary that cannot be installed via slapos # needs ping, which is a setuid binary that cannot be installed via slapos
# way of building software without root access, so we keep "standard" # way of building software without root access, so we keep "standard"
# /usr/bin and /bin in $PATH # /usr/bin and /bin in $PATH
# * LOCAL_IPV4 is needed for some slapos.core tests # * SLAPOS_TEST_environment is safe to be used by tests, but there is no
# guarantee about free ports on IPV4 and IPV6
# * LOCAL_IPV4 is backward compatible, to be migrated, SLAPOS_TEST_IPV4
environment = environment =
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:/usr/bin/:/bin/ PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
LOCAL_IPV6=$${slap-configuration:ipv6-random} SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
[phantomjs-wrapper] [phantomjs-wrapper]
......
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