Skip to content

Commit 478f286

Browse files
Klaus ZerwesKlaus Zerwes
Klaus Zerwes
authored and
Klaus Zerwes
committed
Revert "fixed tests for ansible 2.12"
include is deprecated and will be removed in 2.16, so there is some time to fix this left This reverts commit 2d39705.
1 parent e509c1f commit 478f286

File tree

18 files changed

+106
-106
lines changed

18 files changed

+106
-106
lines changed

‎tests/ansible/integration/action/all.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
- import_playbook: copy.yml
2-
- import_playbook: fixup_perms2__copy.yml
3-
- import_playbook: low_level_execute_command.yml
4-
- import_playbook: make_tmp_path.yml
5-
- import_playbook: make_tmp_path__double.yml
6-
- import_playbook: remote_expand_user.yml
7-
- import_playbook: remote_file_exists.yml
8-
- import_playbook: remove_tmp_path.yml
9-
- import_playbook: synchronize.yml
10-
- import_playbook: transfer_data.yml
1+
- include: copy.yml
2+
- include: fixup_perms2__copy.yml
3+
- include: low_level_execute_command.yml
4+
- include: make_tmp_path.yml
5+
- include: make_tmp_path__double.yml
6+
- include: remote_expand_user.yml
7+
- include: remote_file_exists.yml
8+
- include: remove_tmp_path.yml
9+
- include: synchronize.yml
10+
- include: transfer_data.yml

‎tests/ansible/integration/async/all.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
- import_playbook: multiple_items_loop.yml
2-
- import_playbook: result_binary_producing_json.yml
3-
- import_playbook: result_binary_producing_junk.yml
4-
- import_playbook: result_shell_echo_hi.yml
5-
- import_playbook: runner_new_process.yml
6-
- import_playbook: runner_one_job.yml
7-
- import_playbook: runner_timeout_then_polling.yml
8-
- import_playbook: runner_two_simultaneous_jobs.yml
9-
- import_playbook: runner_with_polling_and_timeout.yml
1+
- include: multiple_items_loop.yml
2+
- include: result_binary_producing_json.yml
3+
- include: result_binary_producing_junk.yml
4+
- include: result_shell_echo_hi.yml
5+
- include: runner_new_process.yml
6+
- include: runner_one_job.yml
7+
- include: runner_timeout_then_polling.yml
8+
- include: runner_two_simultaneous_jobs.yml
9+
- include: runner_with_polling_and_timeout.yml

‎tests/ansible/integration/become/all.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
- import_playbook: su_password.yml
3-
- import_playbook: sudo_flags_failure.yml
4-
- import_playbook: sudo_nonexistent.yml
5-
- import_playbook: sudo_nopassword.yml
6-
- import_playbook: sudo_password.yml
7-
- import_playbook: sudo_requiretty.yml
2+
- include: su_password.yml
3+
- include: sudo_flags_failure.yml
4+
- include: sudo_nonexistent.yml
5+
- include: sudo_nopassword.yml
6+
- include: sudo_password.yml
7+
- include: sudo_requiretty.yml

‎tests/ansible/integration/connection/all.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22

3-
- import_playbook: become_same_user.yml
4-
- import_playbook: disconnect_during_module.yml
5-
- import_playbook: disconnect_resets_connection.yml
6-
- import_playbook: exec_command.yml
7-
- import_playbook: home_dir.yml
8-
- import_playbook: put_large_file.yml
9-
- import_playbook: put_small_file.yml
10-
- import_playbook: reset.yml
11-
- import_playbook: reset_become.yml
3+
- include: become_same_user.yml
4+
- include: disconnect_during_module.yml
5+
- include: disconnect_resets_connection.yml
6+
- include: exec_command.yml
7+
- include: home_dir.yml
8+
- include: put_large_file.yml
9+
- include: put_small_file.yml
10+
- include: reset.yml
11+
- include: reset_become.yml

‎tests/ansible/integration/connection_delegation/all.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
- import_playbook: delegate_to_template.yml
2-
- import_playbook: local_action.yml
3-
- import_playbook: osa_container_standalone.yml
4-
- import_playbook: osa_delegate_to_self.yml
5-
- import_playbook: stack_construction.yml
1+
- include: delegate_to_template.yml
2+
- include: local_action.yml
3+
- include: osa_container_standalone.yml
4+
- include: osa_delegate_to_self.yml
5+
- include: stack_construction.yml

‎tests/ansible/integration/connection_loader/all.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- import_playbook: local_blemished.yml
2-
- import_playbook: paramiko_unblemished.yml
3-
- import_playbook: ssh_blemished.yml
1+
- include: local_blemished.yml
2+
- include: paramiko_unblemished.yml
3+
- include: ssh_blemished.yml

‎tests/ansible/integration/context_service/all.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- import_playbook: disconnect_cleanup.yml
2-
- import_playbook: lru_one_target.yml
3-
- import_playbook: reconnection.yml
4-
- import_playbook: remote_name.yml
1+
- include: disconnect_cleanup.yml
2+
- include: lru_one_target.yml
3+
- include: reconnection.yml
4+
- include: remote_name.yml

‎tests/ansible/integration/glibc_caches/all.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
- import_playbook: resolv_conf.yml
2+
- include: resolv_conf.yml

‎tests/ansible/integration/interpreter_discovery/all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
- import_playbook: complex_args.yml
2-
- import_playbook: ansible_2_8_tests.yml
1+
- include: complex_args.yml
2+
- include: ansible_2_8_tests.yml

‎tests/ansible/integration/local/all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
- import_playbook: cwd_preserved.yml
3-
- import_playbook: env_preserved.yml
2+
- include: cwd_preserved.yml
3+
- include: env_preserved.yml
44

0 commit comments

Comments
 (0)