diff options
| author | Matt Clay <matt@mystile.com> | 2019-03-08 22:59:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 22:59:00 -0800 |
| commit | 5134ba95ca6c105f08467635b219608d0bdfccf3 (patch) | |
| tree | fd3bf04cd9d66e5938899b01fde6253d2068e5d5 /test/integration/targets/conditionals | |
| parent | 6588df505c85dcb43aa603c79687a406f24c765d (diff) | |
| download | ansible-5134ba95ca6c105f08467635b219608d0bdfccf3.tar.gz | |
Fix conditionals integration test. (#53583)
* Fix inventory for conditionals test.
* Remove extra groups from conditionals test.
Diffstat (limited to 'test/integration/targets/conditionals')
| -rw-r--r-- | test/integration/targets/conditionals/aliases | 2 | ||||
| -rw-r--r-- | test/integration/targets/conditionals/inventory | 5 | ||||
| -rwxr-xr-x | test/integration/targets/conditionals/runme.sh | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/test/integration/targets/conditionals/aliases b/test/integration/targets/conditionals/aliases index 3581b8a7ed..a6dafcf8cd 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 4c2e0d1e86..0000000000 --- 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 c47bace549..65a12da804 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 "$@" |