From 5fa8d5448899cb42c49ec9fcab1aefa9c6c52bba Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Mon, 7 Jan 2019 17:54:11 -0800
Subject: [PATCH] Use relative inventory paths instead of symlinks.

(cherry picked from commit 4915920d7178c7f86a16690fe4b152b98cecead9)
---
 test/integration/targets/filters/inventory         | 1 -
 test/integration/targets/filters/runme.sh          | 2 +-
 test/integration/targets/hash/inventory            | 1 -
 test/integration/targets/hash/runme.sh             | 4 ++--
 test/integration/targets/shadowed_module/inventory | 1 -
 test/integration/targets/shadowed_module/runme.sh  | 2 +-
 test/integration/targets/var_blending/inventory    | 1 -
 test/integration/targets/var_blending/runme.sh     | 2 +-
 8 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 120000 test/integration/targets/filters/inventory
 delete mode 120000 test/integration/targets/hash/inventory
 delete mode 120000 test/integration/targets/shadowed_module/inventory
 delete mode 120000 test/integration/targets/var_blending/inventory

diff --git a/test/integration/targets/filters/inventory b/test/integration/targets/filters/inventory
deleted file mode 120000
index c743258cef7..00000000000
--- 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 49c1e1b45e2..c3a63730e30 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 c743258cef7..00000000000
--- 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 efa4331d657..9448e4e098b 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 c743258cef7..00000000000
--- 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 08ee0d05df4..4703140094a 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 c743258cef7..00000000000
--- 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 24e523ced5c..8f09e3e919d 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 "$@"