Skip to content

slapos
slapos
Commit 29d71680 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak
Browse files
Options

erp5testnode/testsuite: Provide environment with SLAPOS_TEST_* 

Those values are free to be used by tests in order to obtain working
IPv4 and IPv6 addresses or other parameters fetched during test node
instantiation.

Note that old-style keys (like LOCAL_IPV4 and LOCAL_IPV6) are kept for
backward compatibility.

/reviewed-on nexedi/slapos!471
parent 21a8c135
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 10 deletions
software/erp5testnode/testsuite/caddy-frontend/buildout.hash.cfg
View file @ 29d71680
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = d8d9e9a4bd00ccba2c448bb9d5d6aeae md5sum = 38aadab03e4065e962c9f19e0bfb9645
software/erp5testnode/testsuite/caddy-frontend/instance.cfg
View file @ 29d71680
...@@ -39,6 +39,9 @@ command-line = ...@@ -39,6 +39,9 @@ command-line =
environment = environment =
PATH=${quic_client-bin:location}:${curl:location}/bin/:/usr/bin/:/bin PATH=${quic_client-bin:location}:${curl:location}/bin/:/usr/bin/:/bin
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
TEST_SR=${template:test_software_release} TEST_SR=${template:test_software_release}
SLAPOS_TEST_SR=${template:test_software_release}
software/erp5testnode/testsuite/erp5/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 6d126917e17c00ee012c4cf0a52429d1 md5sum = 2437a9abd52fcd74c55ae601ca6b4807
software/erp5testnode/testsuite/erp5/instance.cfg.in
View file @ 29d71680
...@@ -41,5 +41,7 @@ command-line = ...@@ -41,5 +41,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/bin/:/usr/bin/ PATH=${buildout:bin-directory}:/bin/:/usr/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/kvm/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8109649ec9ba66de3ac67b742c28c349 md5sum = c3c214e033f87fe93ec6caac7efe97a4
software/erp5testnode/testsuite/kvm/instance.cfg.in
View file @ 29d71680
...@@ -40,5 +40,7 @@ command-line = ...@@ -40,5 +40,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/monitor/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 887a866f115c1e75b695379990e1709b md5sum = d1bda3daeef73f8e3de0b7457105de99
software/erp5testnode/testsuite/monitor/instance.cfg.in
View file @ 29d71680
...@@ -40,5 +40,7 @@ command-line = ...@@ -40,5 +40,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/plantuml/buildout.hash.cfg
View file @ 29d71680
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 4ab7207a0440a904b4374add9b744312 md5sum = 5d1e8428b0c756e23b4c471966304f77
software/erp5testnode/testsuite/plantuml/instance.cfg.in
View file @ 29d71680
...@@ -39,5 +39,7 @@ command-line = ...@@ -39,5 +39,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/powerdns/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = af932783693bf8a7fec32d00a8e07ed2 md5sum = 040e718bf9468473775c305281873360
software/erp5testnode/testsuite/powerdns/instance.cfg.in
View file @ 29d71680
...@@ -40,5 +40,7 @@ command-line = ...@@ -40,5 +40,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/proftpd/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 20c5afac025e97c2937852f4d84f7cd3 md5sum = 65cac7655a510db2cd9389a58575100a
software/erp5testnode/testsuite/proftpd/instance.cfg.in
View file @ 29d71680
...@@ -40,5 +40,7 @@ command-line = ...@@ -40,5 +40,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/re6stnet/buildout.hash.cfg
View file @ 29d71680
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 9c5ec49295ceae71df715bf1c90976e2 md5sum = 75203c3be501df1dd4affacabed938d3
software/erp5testnode/testsuite/re6stnet/instance.cfg.in
View file @ 29d71680
...@@ -40,5 +40,7 @@ command-line = ...@@ -40,5 +40,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/seleniumserver/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 3019fd19f6623cca92741582b265a1da md5sum = 7c4defb960e2426c8ff2f380a3e94a12
software/erp5testnode/testsuite/seleniumserver/instance.cfg.in
View file @ 29d71680
...@@ -41,5 +41,7 @@ command-line = ...@@ -41,5 +41,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/bin/:/usr/bin/ PATH=${buildout:bin-directory}:/bin/:/usr/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
software/erp5testnode/testsuite/slaprunner/buildout.hash.cfg
View file @ 29d71680
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 6fa1420739f58e722631564b08727060 md5sum = e302546e00eeb5419388cfb7f332d379
software/erp5testnode/testsuite/slaprunner/instance.cfg.in
View file @ 29d71680
...@@ -40,5 +40,7 @@ command-line = ...@@ -40,5 +40,7 @@ command-line =
environment = environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/ PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7