From 5134ba95ca6c105f08467635b219608d0bdfccf3 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 8 Mar 2019 22:59:00 -0800 Subject: [PATCH] Fix conditionals integration test. (#53583) * Fix inventory for conditionals test. * Remove extra groups from conditionals test. --- test/integration/targets/conditionals/aliases | 2 -- test/integration/targets/conditionals/inventory | 5 ----- test/integration/targets/conditionals/runme.sh | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 test/integration/targets/conditionals/inventory diff --git a/test/integration/targets/conditionals/aliases b/test/integration/targets/conditionals/aliases index 3581b8a7ede..a6dafcf8cd8 100644 --- a/test/integration/targets/conditionals/aliases +++ b/test/integration/targets/conditionals/aliases @@ -1,3 +1 @@ shippable/posix/group1 -shippable/posix/group2 -shippable/posix/group3 diff --git a/test/integration/targets/conditionals/inventory b/test/integration/targets/conditionals/inventory deleted file mode 100644 index 4c2e0d1e86c..00000000000 --- a/test/integration/targets/conditionals/inventory +++ /dev/null @@ -1,5 +0,0 @@ -# Do not put test specific entries in this inventory file. -# For script based test targets (using runme.sh) put the inventory file in the test's directory instead. - -[testgroup] -testhost ansible_connection=local diff --git a/test/integration/targets/conditionals/runme.sh b/test/integration/targets/conditionals/runme.sh index c47bace549a..65a12da8049 100755 --- a/test/integration/targets/conditionals/runme.sh +++ b/test/integration/targets/conditionals/runme.sh @@ -2,5 +2,5 @@ set -eux -ANSIBLE_CONDITIONAL_BARE_VARS=1 ansible-playbook -i inventory play.yml "$@" -ANSIBLE_CONDITIONAL_BARE_VARS=0 ansible-playbook -i inventory play.yml "$@" +ANSIBLE_CONDITIONAL_BARE_VARS=1 ansible-playbook -i ../../inventory play.yml "$@" +ANSIBLE_CONDITIONAL_BARE_VARS=0 ansible-playbook -i ../../inventory play.yml "$@"