diff options
author | Brian Coca <bcoca@users.noreply.github.com> | 2019-02-28 00:20:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-28 00:20:16 +0100 |
commit | cfba6dfe9141fb7f66bf10573012bdae3f5a847a (patch) | |
tree | 6b31b9cafdc2e05077c30b7c275b2df75d9ffe50 /test/integration/targets/order | |
parent | Adding postgresql configuration module (#45072) (diff) | |
download | ansible-cfba6dfe9141fb7f66bf10573012bdae3f5a847a.tar.xz ansible-cfba6dfe9141fb7f66bf10573012bdae3f5a847a.zip |
Ensure play order is obeyed (#49897)
* Ensure play order is obeyed
it was being ignored depending on other options
also added tests for each order (except shuffle) both serial and not
fixes #49846
Diffstat (limited to 'test/integration/targets/order')
-rw-r--r-- | test/integration/targets/order/aliases | 3 | ||||
-rw-r--r-- | test/integration/targets/order/inventory | 9 | ||||
-rw-r--r-- | test/integration/targets/order/order.yml | 27 | ||||
-rwxr-xr-x | test/integration/targets/order/runme.sh | 13 |
4 files changed, 52 insertions, 0 deletions
diff --git a/test/integration/targets/order/aliases b/test/integration/targets/order/aliases new file mode 100644 index 0000000000..3581b8a7ed --- /dev/null +++ b/test/integration/targets/order/aliases @@ -0,0 +1,3 @@ +shippable/posix/group1 +shippable/posix/group2 +shippable/posix/group3 diff --git a/test/integration/targets/order/inventory b/test/integration/targets/order/inventory new file mode 100644 index 0000000000..11f322a192 --- /dev/null +++ b/test/integration/targets/order/inventory @@ -0,0 +1,9 @@ +[incremental] +hostB +hostA +hostD +hostC + +[incremental:vars] +ansible_connection=local +ansible_python_interpreter='{{ansible_playbook_python}}' diff --git a/test/integration/targets/order/order.yml b/test/integration/targets/order/order.yml new file mode 100644 index 0000000000..59691a2a76 --- /dev/null +++ b/test/integration/targets/order/order.yml @@ -0,0 +1,27 @@ +- name: just plain order + hosts: all + gather_facts: false + order: '{{ myorder|default("inventory")}}' + tasks: + - shell: echo '{{inventory_hostname}}' >> hostlist.txt + +- name: with serial + hosts: all + gather_facts: false + serial: 1 + order: '{{ myorder|default("inventory")}}' + tasks: + - shell: echo '{{inventory_hostname}}' >> shostlist.txt + +- name: ensure everything works + hosts: localhost + gather_facts: false + tasks: + - assert: + that: + - item.1 == hostlist[item.0] + - item.1 == shostlist[item.0] + loop: '{{ lookup("indexed_items", inputlist) }}' + vars: + hostlist: '{{lookup("file", "hostlist.txt").splitlines()}}' + shostlist: '{{lookup("file", "shostlist.txt").splitlines()}}' diff --git a/test/integration/targets/order/runme.sh b/test/integration/targets/order/runme.sh new file mode 100755 index 0000000000..16d86cca83 --- /dev/null +++ b/test/integration/targets/order/runme.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -eux + +for EXTRA in '{"inputlist": ["hostB", "hostA", "hostD", "hostC"]}' \ + '{"myorder": "inventory", "inputlist": ["hostB", "hostA", "hostD", "hostC"]}' \ + '{"myorder": "sorted", "inputlist": ["hostA", "hostB", "hostC", "hostD"]}' \ + '{"myorder": "reverse_sorted", "inputlist": ["hostD", "hostC", "hostB", "hostA"]}' \ + '{"myorder": "reverse_inventory", "inputlist": ["hostC", "hostD", "hostA", "hostB"]}' +do + rm shostlist.txt hostlist.txt || true + ansible-playbook order.yml --forks 1 -i inventory -e "$EXTRA" "$@" +done |