From f82bd3d714605ddaa1b1e29d24a56d20cdc5c498 Mon Sep 17 00:00:00 2001
From: Klaus Zerwes <Klaus.Zerwes@rosalux.org>
Date: Sun, 12 Dec 2021 20:39:06 +0100
Subject: [PATCH] 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 7bc2102d2b7c952cb4f09008a2dcfcf80b08a00a.

---
 tests/ansible/integration/all.yml | 36 +++++++++++++++----------------
 tests/ansible/regression/all.yml  | 30 +++++++++++++-------------
 tests/ansible/setup/all.yml       |  2 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml
index ac196584..6bd5059a 100644
--- a/tests/ansible/integration/all.yml
+++ b/tests/ansible/integration/all.yml
@@ -3,39 +3,39 @@
 # This playbook imports all tests that are known to work at present.
 #
 
-- import_playbook: action/all.yml
+- include: action/all.yml
   tags: action
-- import_playbook: async/all.yml
+- include: async/all.yml
   tags: async
-- import_playbook: become/all.yml
+- include: become/all.yml
   tags: become
-- import_playbook: connection/all.yml
+- include: connection/all.yml
   tags: connection
-- import_playbook: connection_delegation/all.yml
+- include: connection_delegation/all.yml
   tags: connection_delegation
-- import_playbook: connection_loader/all.yml
+- include: connection_loader/all.yml
   tags: connection_loader
-- import_playbook: context_service/all.yml
+- include: context_service/all.yml
   tags: context_service
-- import_playbook: glibc_caches/all.yml
+- include: glibc_caches/all.yml
   tags: glibc_caches
-- import_playbook: interpreter_discovery/all.yml
+- include: interpreter_discovery/all.yml
   tags: interpreter_discovery
-- import_playbook: local/all.yml
+- include: local/all.yml
   tags: local
-- import_playbook: module_utils/all.yml
+- include: module_utils/all.yml
   tags: module_utils
-- import_playbook: playbook_semantics/all.yml
+- include: playbook_semantics/all.yml
   tags: playbook_semantics
-- import_playbook: process/all.yml
+- include: process/all.yml
   tags: process
-- import_playbook: runner/all.yml
+- include: runner/all.yml
   tags: runner
-- import_playbook: ssh/all.yml
+- include: ssh/all.yml
   tags: ssh
-- import_playbook: strategy/all.yml
+- include: strategy/all.yml
   tags: strategy
-- import_playbook: stub_connections/all.yml
+- include: stub_connections/all.yml
   tags: stub_connections
-- import_playbook: transport_config/all.yml
+- include: transport_config/all.yml
   tags: transport_config
diff --git a/tests/ansible/regression/all.yml b/tests/ansible/regression/all.yml
index 875d520e..06ffdf61 100644
--- a/tests/ansible/regression/all.yml
+++ b/tests/ansible/regression/all.yml
@@ -1,30 +1,30 @@
-- import_playbook: issue_109__target_has_old_ansible_installed.yml
+- include: issue_109__target_has_old_ansible_installed.yml
   tags: regression
-- import_playbook: issue_113__duplicate_module_imports.yml
+- include: issue_113__duplicate_module_imports.yml
   tags: regression
-- import_playbook: issue_118__script_not_marked_exec.yml
+- include: issue_118__script_not_marked_exec.yml
   tags: regression
-- import_playbook: issue_122__environment_difference.yml
+- include: issue_122__environment_difference.yml
   tags: regression
-- import_playbook: issue_140__thread_pileup.yml
+- include: issue_140__thread_pileup.yml
   tags: regression
-- import_playbook: issue_152__local_action_wrong_interpreter.yml
+- include: issue_152__local_action_wrong_interpreter.yml
   tags: regression
-- import_playbook: issue_152__virtualenv_python_fails.yml
+- include: issue_152__virtualenv_python_fails.yml
   tags: regression
-- import_playbook: issue_154__module_state_leaks.yml
+- include: issue_154__module_state_leaks.yml
   tags: regression
-- import_playbook: issue_177__copy_module_failing.yml
+- include: issue_177__copy_module_failing.yml
   tags: regression
-- import_playbook: issue_332_ansiblemoduleerror_first_occurrence.yml
+- include: issue_332_ansiblemoduleerror_first_occurrence.yml
   tags: regression
-- import_playbook: issue_558_unarchive_failed.yml
+- include: issue_558_unarchive_failed.yml
   tags: regression
-- import_playbook: issue_590__sys_modules_crap.yml
+- include: issue_590__sys_modules_crap.yml
   tags: regression
-- import_playbook: issue_591__setuptools_cwd_crash.yml
+- include: issue_591__setuptools_cwd_crash.yml
   tags: regression
-- import_playbook: issue_615__streaming_transfer.yml
+- include: issue_615__streaming_transfer.yml
   tags: regression
-- import_playbook: issue_655__wait_for_connection_error.yml
+- include: issue_655__wait_for_connection_error.yml
   tags: regression
diff --git a/tests/ansible/setup/all.yml b/tests/ansible/setup/all.yml
index 2ca6b97c..c51fa295 100644
--- a/tests/ansible/setup/all.yml
+++ b/tests/ansible/setup/all.yml
@@ -1 +1 @@
-- import_playbook: report.yml
+- include: report.yml