Commit 5d5a5b35 authored by Xavier Thompson's avatar Xavier Thompson

slapos-sr-testing: forward ipv6 range if available

parent bf56808b
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 06379c0ed1fe0df409c7b8f61fc218eb md5sum = ed0f91f39d5eda903938aa527625f40d
...@@ -28,13 +28,20 @@ test-working-dir = ${buildout:directory}/tmp ...@@ -28,13 +28,20 @@ test-working-dir = ${buildout:directory}/tmp
nxdtest-working-dir = ${:var}/nxdtest nxdtest-working-dir = ${:var}/nxdtest
[slapos-test-runner-nxdtest-environment.sh] [slapos-test-runner-nxdtest-environment.sh]
recipe = slapos.recipe.template recipe = slapos.recipe.template:jinja2
output = ${directory:etc}/${:_buildout_section_name_} output = ${directory:etc}/${:_buildout_section_name_}
PATH={{ buildout['bin-directory'] }}:{{ curl_location }}/bin:{{ faketime_location }}/bin:{{ openssl_location }}/bin:/usr/bin:/bin
context =
section slap slap-configuration
key ipv6_random slap-configuration:ipv6-random
{%- raw %}
inline = inline =
export PATH={{ buildout['bin-directory'] }}:{{ curl_location }}/bin:{{ faketime_location }}/bin:{{ openssl_location }}/bin:/usr/bin:/bin export PATH=${:PATH}
export SLAPOS_TEST_IPV4=${slap-configuration:ipv4-random} export SLAPOS_TEST_IPV4=${slap-configuration:ipv4-random}
export SLAPOS_TEST_IPV6=${slap-configuration:ipv6-random} export SLAPOS_TEST_IPV6={{ slap.get('ipv6-range-network') or ipv6_random }}
export SLAPOS_TEST_WORKING_DIR=${directory:test-working-dir} export SLAPOS_TEST_WORKING_DIR=${directory:test-working-dir}
{%- endraw %}
[slapos-test-runner-dot-nxdtest] [slapos-test-runner-dot-nxdtest]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
  • /cc @xavier_thompson @jerome

    This commit is actually breaking a lot of tests because the SLAPOS_TEST_IPV6 is now a range instead of a single IPv6.

  • mentioned in merge request !1413 (merged)

    Toggle commit list
  • mentioned in commit 27278328

    Toggle commit list
  • mentioned in commit a5058cfc

    Toggle commit list
  • mentioned in commit ef0eb2a7

    Toggle commit list
  • Did we consider exposing the IPV6 range with another environment variable ? something like: SLAPOS_TEST_IPV6 remains the same (the IP) and we introduce something like SLAPOS_TEST_IPV6_RANGE which would be the range and it would be empty when the partition does not have range.

    I am thinking that we will one day do the same with IPv4 and that we have the same environment variables in slapos-testing, but I am not sure using two variables would really be better

  • mentioned in commit ef4a8163

    Toggle commit list
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