diff options
| author | Matt Clay <matt@mystile.com> | 2019-01-07 17:54:11 -0800 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2019-01-09 21:00:26 -0800 |
| commit | 5fa8d5448899cb42c49ec9fcab1aefa9c6c52bba (patch) | |
| tree | 01369bc456f5e529b3f60ed49a7c6ba9734659d7 | |
| parent | 7a4f2aa47bb880916b31ba24444d6b81dfac9323 (diff) | |
| download | ansible-5fa8d5448899cb42c49ec9fcab1aefa9c6c52bba.tar.gz | |
Use relative inventory paths instead of symlinks.
(cherry picked from commit 4915920d7178c7f86a16690fe4b152b98cecead9)
| l--------- | test/integration/targets/filters/inventory | 1 | ||||
| -rwxr-xr-x | test/integration/targets/filters/runme.sh | 2 | ||||
| l--------- | test/integration/targets/hash/inventory | 1 | ||||
| -rwxr-xr-x | test/integration/targets/hash/runme.sh | 4 | ||||
| l--------- | test/integration/targets/shadowed_module/inventory | 1 | ||||
| -rwxr-xr-x | test/integration/targets/shadowed_module/runme.sh | 2 | ||||
| l--------- | test/integration/targets/var_blending/inventory | 1 | ||||
| -rwxr-xr-x | test/integration/targets/var_blending/runme.sh | 2 |
8 files changed, 5 insertions, 9 deletions
diff --git a/test/integration/targets/filters/inventory b/test/integration/targets/filters/inventory deleted file mode 120000 index c743258cef..0000000000 --- a/test/integration/targets/filters/inventory +++ /dev/null @@ -1 +0,0 @@ -../../inventory
\ No newline at end of file diff --git a/test/integration/targets/filters/runme.sh b/test/integration/targets/filters/runme.sh index 49c1e1b45e..c3a63730e3 100755 --- a/test/integration/targets/filters/runme.sh +++ b/test/integration/targets/filters/runme.sh @@ -6,4 +6,4 @@ set -eux # because plugins and requirements are loaded before the task runs pip install jmespath -ANSIBLE_ROLES_PATH=../ ansible-playbook filters.yml -i inventory -e @../../integration_config.yml "$@" +ANSIBLE_ROLES_PATH=../ ansible-playbook filters.yml -i ../../inventory -e @../../integration_config.yml "$@" diff --git a/test/integration/targets/hash/inventory b/test/integration/targets/hash/inventory deleted file mode 120000 index c743258cef..0000000000 --- a/test/integration/targets/hash/inventory +++ /dev/null @@ -1 +0,0 @@ -../../inventory
\ No newline at end of file diff --git a/test/integration/targets/hash/runme.sh b/test/integration/targets/hash/runme.sh index efa4331d65..9448e4e098 100755 --- a/test/integration/targets/hash/runme.sh +++ b/test/integration/targets/hash/runme.sh @@ -4,5 +4,5 @@ set -eux JSON_ARG='{"test_hash":{"extra_args":"this is an extra arg"}}' -ANSIBLE_HASH_BEHAVIOUR=replace ansible-playbook test_hash.yml -i inventory -v "$@" -e "${JSON_ARG}" -ANSIBLE_HASH_BEHAVIOUR=merge ansible-playbook test_hash.yml -i inventory -v "$@" -e "${JSON_ARG}" +ANSIBLE_HASH_BEHAVIOUR=replace ansible-playbook test_hash.yml -i ../../inventory -v "$@" -e "${JSON_ARG}" +ANSIBLE_HASH_BEHAVIOUR=merge ansible-playbook test_hash.yml -i ../../inventory -v "$@" -e "${JSON_ARG}" diff --git a/test/integration/targets/shadowed_module/inventory b/test/integration/targets/shadowed_module/inventory deleted file mode 120000 index c743258cef..0000000000 --- a/test/integration/targets/shadowed_module/inventory +++ /dev/null @@ -1 +0,0 @@ -../../inventory
\ No newline at end of file diff --git a/test/integration/targets/shadowed_module/runme.sh b/test/integration/targets/shadowed_module/runme.sh index 08ee0d05df..4703140094 100755 --- a/test/integration/targets/shadowed_module/runme.sh +++ b/test/integration/targets/shadowed_module/runme.sh @@ -11,4 +11,4 @@ fi # This playbook calls a lookup which shadows a keyword. # This is an ok situation, and should not error -ansible-playbook playbook_lookup.yml -i inventory -e @../../integration_config.yml "$@" +ansible-playbook playbook_lookup.yml -i ../../inventory -e @../../integration_config.yml "$@" diff --git a/test/integration/targets/var_blending/inventory b/test/integration/targets/var_blending/inventory deleted file mode 120000 index c743258cef..0000000000 --- a/test/integration/targets/var_blending/inventory +++ /dev/null @@ -1 +0,0 @@ -../../inventory
\ No newline at end of file diff --git a/test/integration/targets/var_blending/runme.sh b/test/integration/targets/var_blending/runme.sh index 24e523ced5..8f09e3e919 100755 --- a/test/integration/targets/var_blending/runme.sh +++ b/test/integration/targets/var_blending/runme.sh @@ -2,4 +2,4 @@ set -eux -ansible-playbook test_var_blending.yml -i inventory -e @integration_config.yml -v "$@" +ansible-playbook test_var_blending.yml -i ../../inventory -e @integration_config.yml -v "$@" |