diff --git a/docs/docsite/rst/network/dev_guide/developing_resource_modules_network.rst b/docs/docsite/rst/network/dev_guide/developing_resource_modules_network.rst index f5715b5f06b..6f6ac158650 100644 --- a/docs/docsite/rst/network/dev_guide/developing_resource_modules_network.rst +++ b/docs/docsite/rst/network/dev_guide/developing_resource_modules_network.rst @@ -518,7 +518,7 @@ The following example walks through the integration tests for the ``vyos.vyos.vy .. code-block:: yaml --- - - include: cli.yaml + - import_tasks: cli.yaml tags: - cli @@ -538,13 +538,20 @@ The following example walks through the integration tests for the ``vyos.vyos.vy set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" - name: run test cases (connection=network_cli) - include: "{{ test_case_to_run }} ansible_connection=network_cli" + include_tasks: + file: "{{ test_case_to_run }}" + vars: + ansible_connection: network_cli with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run - name: run test case (connection=local) - include: "{{ test_case_to_run }} ansible_connection=local ansible_become=no" + include_tasks: + file: "{{ test_case_to_run }}" + vars: + ansible_connection: local + ansible_become: no with_first_found: "{{ test_items }}" loop_control: loop_var: test_case_to_run @@ -558,11 +565,11 @@ The following example walks through the integration tests for the ``vyos.vyos.vy msg: START vyos_l3_interfaces merged integration tests on connection={{ ansible_connection }} - - include_tasks: _remove_config.yaml + - import_tasks: _remove_config.yaml - block: - - include_tasks: _populate.yaml + - import_tasks: _populate.yaml - name: Overrides all device configuration with provided configuration register: result @@ -613,7 +620,7 @@ The following example walks through the integration tests for the ``vyos.vyos.vy \ == 0 }}" always: - - include_tasks: _remove_config.yaml + - import_tasks: _remove_config.yaml Detecting test resources at runtime diff --git a/test/integration/targets/any_errors_fatal/on_includes.yml b/test/integration/targets/any_errors_fatal/on_includes.yml index 981d9f46d0b..cbc51cb239d 100644 --- a/test/integration/targets/any_errors_fatal/on_includes.yml +++ b/test/integration/targets/any_errors_fatal/on_includes.yml @@ -4,4 +4,4 @@ hosts: testhost,testhost2 any_errors_fatal: True tasks: - - include: test_fatal.yml + - import_tasks: test_fatal.yml diff --git a/test/integration/targets/become/tasks/main.yml b/test/integration/targets/become/tasks/main.yml index 3feb5cc729d..b4c7b6015dc 100644 --- a/test/integration/targets/become/tasks/main.yml +++ b/test/integration/targets/become/tasks/main.yml @@ -1,5 +1,5 @@ - include_vars: default.yml -- include: default.yml -- include: sudo.yml -- include: su.yml +- import_tasks: default.yml +- import_tasks: sudo.yml +- import_tasks: su.yml diff --git a/test/integration/targets/blocks/main.yml b/test/integration/targets/blocks/main.yml index 012d5ab2703..efe358a3b42 100644 --- a/test/integration/targets/blocks/main.yml +++ b/test/integration/targets/blocks/main.yml @@ -96,8 +96,8 @@ tasks: - block: - name: include fail.yml in tasks - include: fail.yml - args: + import_tasks: fail.yml + vars: msg: "failed from tasks" - name: tasks flag should not be set after failure set_fact: @@ -106,8 +106,8 @@ - set_fact: rescue_run_after_include_fail: true - name: include fail.yml in rescue - include: fail.yml - args: + import_tasks: fail.yml + vars: msg: "failed from rescue" - name: flag should not be set after failure in rescue set_fact: diff --git a/test/integration/targets/blocks/nested_fail.yml b/test/integration/targets/blocks/nested_fail.yml index 31ae870e373..12e33cb47d3 100644 --- a/test/integration/targets/blocks/nested_fail.yml +++ b/test/integration/targets/blocks/nested_fail.yml @@ -1,3 +1,3 @@ -- include: fail.yml - args: +- import_tasks: fail.yml + vars: msg: "nested {{msg}}" diff --git a/test/integration/targets/blocks/nested_nested_fail.yml b/test/integration/targets/blocks/nested_nested_fail.yml index e9a050fb986..f63fa5ce272 100644 --- a/test/integration/targets/blocks/nested_nested_fail.yml +++ b/test/integration/targets/blocks/nested_nested_fail.yml @@ -1,3 +1,3 @@ -- include: nested_fail.yml - args: +- import_tasks: nested_fail.yml + vars: msg: "nested {{msg}}" diff --git a/test/integration/targets/copy/tasks/tests.yml b/test/integration/targets/copy/tasks/tests.yml index be9553179e2..fa4254c79ae 100644 --- a/test/integration/targets/copy/tasks/tests.yml +++ b/test/integration/targets/copy/tasks/tests.yml @@ -1489,13 +1489,13 @@ # src is a file, dest is a non-existent directory (2 levels of directories): # using remote_src # checks that dest is created -- include: dest_in_non_existent_directories_remote_src.yml +- include_tasks: file=dest_in_non_existent_directories_remote_src.yml with_items: - { src: 'foo.txt', dest: 'new_sub_dir1/sub_dir2/', check: 'new_sub_dir1/sub_dir2/foo.txt' } # src is a file, dest is file in a non-existent directory: checks that a failure occurs # using remote_src -- include: src_file_dest_file_in_non_existent_dir_remote_src.yml +- include_tasks: file=src_file_dest_file_in_non_existent_dir_remote_src.yml with_items: - 'new_sub_dir1/sub_dir2/foo.txt' - 'new_sub_dir1/foo.txt' @@ -1504,7 +1504,7 @@ # src is a file, dest is a non-existent directory (2 levels of directories): # checks that dest is created -- include: dest_in_non_existent_directories.yml +- include_tasks: file=dest_in_non_existent_directories.yml with_items: - { src: 'foo.txt', dest: 'new_sub_dir1/sub_dir2/', check: 'new_sub_dir1/sub_dir2/foo.txt' } - { src: 'subdir', dest: 'new_sub_dir1/sub_dir2/', check: 'new_sub_dir1/sub_dir2/subdir/bar.txt' } @@ -1513,7 +1513,7 @@ - { src: 'subdir/', dest: 'new_sub_dir1/sub_dir2', check: 'new_sub_dir1/sub_dir2/bar.txt' } # src is a file, dest is file in a non-existent directory: checks that a failure occurs -- include: src_file_dest_file_in_non_existent_dir.yml +- include_tasks: file=src_file_dest_file_in_non_existent_dir.yml with_items: - 'new_sub_dir1/sub_dir2/foo.txt' - 'new_sub_dir1/foo.txt' diff --git a/test/integration/targets/dpkg_selections/tasks/main.yaml b/test/integration/targets/dpkg_selections/tasks/main.yaml index 6abd1dec100..abf9fa1b45e 100644 --- a/test/integration/targets/dpkg_selections/tasks/main.yaml +++ b/test/integration/targets/dpkg_selections/tasks/main.yaml @@ -1,3 +1,3 @@ --- - - include: 'dpkg_selections.yaml' + - include_tasks: file='dpkg_selections.yaml' when: ansible_distribution in ('Ubuntu', 'Debian') diff --git a/test/integration/targets/file/tasks/directory_as_dest.yml b/test/integration/targets/file/tasks/directory_as_dest.yml index 9b6ddb5dc92..85451e43fc1 100644 --- a/test/integration/targets/file/tasks/directory_as_dest.yml +++ b/test/integration/targets/file/tasks/directory_as_dest.yml @@ -1,6 +1,6 @@ # File module tests for overwriting directories - name: Initialize the test output dir - include: initialize.yml + import_tasks: initialize.yml # We need to make this more consistent: # https://github.com/ansible/proposals/issues/111 diff --git a/test/integration/targets/file/tasks/selinux_tests.yml b/test/integration/targets/file/tasks/selinux_tests.yml index 6a95c4427a8..8efe819543c 100644 --- a/test/integration/targets/file/tasks/selinux_tests.yml +++ b/test/integration/targets/file/tasks/selinux_tests.yml @@ -17,7 +17,7 @@ # along with Ansible. If not, see . - name: Initialize the test output dir - include: initialize.yml + import_tasks: initialize.yml - name: touch a file for testing file: path={{output_dir}}/foo-se.txt state=touch diff --git a/test/integration/targets/file/tasks/state_link.yml b/test/integration/targets/file/tasks/state_link.yml index 17534815381..991159e2e7e 100644 --- a/test/integration/targets/file/tasks/state_link.yml +++ b/test/integration/targets/file/tasks/state_link.yml @@ -1,7 +1,7 @@ # file module tests for dealing with symlinks (state=link) - name: Initialize the test output dir - include: initialize.yml + import_tasks: initialize.yml # # Basic absolute symlink to a file diff --git a/test/integration/targets/handlers/roles/test_handlers_include/handlers/main.yml b/test/integration/targets/handlers/roles/test_handlers_include/handlers/main.yml index abe01be4ba3..6c3b73c6a3a 100644 --- a/test/integration/targets/handlers/roles/test_handlers_include/handlers/main.yml +++ b/test/integration/targets/handlers/roles/test_handlers_include/handlers/main.yml @@ -1 +1 @@ -- include: handlers.yml +- import_tasks: handlers.yml diff --git a/test/integration/targets/handlers/test_handlers_include.yml b/test/integration/targets/handlers/test_handlers_include.yml index 5514fc10947..158266d2d30 100644 --- a/test/integration/targets/handlers/test_handlers_include.yml +++ b/test/integration/targets/handlers/test_handlers_include.yml @@ -6,7 +6,7 @@ notify: test handler tags: ['playbook_include_handlers'] handlers: - - include: handlers.yml + - import_tasks: handlers.yml - name: verify that role can include handler hosts: testhost diff --git a/test/integration/targets/incidental_ios_file/tasks/cli.yaml b/test/integration/targets/incidental_ios_file/tasks/cli.yaml index d4f663b394a..3eb57691ce5 100644 --- a/test/integration/targets/incidental_ios_file/tasks/cli.yaml +++ b/test/integration/targets/incidental_ios_file/tasks/cli.yaml @@ -10,7 +10,7 @@ set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" - name: run test cases (connection=ansible.netcommon.network_cli) - include: "{{ test_case_to_run }}" + include_tasks: "{{ test_case_to_run }}" with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run diff --git a/test/integration/targets/incidental_ios_file/tasks/main.yaml b/test/integration/targets/incidental_ios_file/tasks/main.yaml index 415c99d8b12..24ad94aea26 100644 --- a/test/integration/targets/incidental_ios_file/tasks/main.yaml +++ b/test/integration/targets/incidental_ios_file/tasks/main.yaml @@ -1,2 +1,2 @@ --- -- { include: cli.yaml, tags: ['cli'] } +- { import_tasks: cli.yaml, tags: ['cli'] } diff --git a/test/integration/targets/incidental_setup_rabbitmq/tasks/main.yml b/test/integration/targets/incidental_setup_rabbitmq/tasks/main.yml index ad401fb3440..e6c870894c1 100644 --- a/test/integration/targets/incidental_setup_rabbitmq/tasks/main.yml +++ b/test/integration/targets/incidental_setup_rabbitmq/tasks/main.yml @@ -1,5 +1,5 @@ --- -- include: ubuntu.yml +- include_tasks: ubuntu.yml when: - ansible_distribution == 'Ubuntu' - ansible_distribution_release != 'focal' diff --git a/test/integration/targets/incidental_vyos_config/tasks/cli.yaml b/test/integration/targets/incidental_vyos_config/tasks/cli.yaml index 22a71d96e65..d601bb700a5 100644 --- a/test/integration/targets/incidental_vyos_config/tasks/cli.yaml +++ b/test/integration/targets/incidental_vyos_config/tasks/cli.yaml @@ -10,13 +10,17 @@ set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" - name: run test case (connection=ansible.netcommon.network_cli) - include: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli" + include_tasks: "file={{ test_case_to_run }}" + vars: + ansible_connection: ansible.netcommon.network_cli with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run - name: run test case (connection=local) - include: "{{ test_case_to_run }} ansible_connection=local" + include_tasks: "file={{ test_case_to_run }}" + vars: + ansible_connection: local with_first_found: "{{ test_items }}" loop_control: loop_var: test_case_to_run diff --git a/test/integration/targets/incidental_vyos_config/tasks/cli_config.yaml b/test/integration/targets/incidental_vyos_config/tasks/cli_config.yaml index 8ed28748193..7e673560cbb 100644 --- a/test/integration/targets/incidental_vyos_config/tasks/cli_config.yaml +++ b/test/integration/targets/incidental_vyos_config/tasks/cli_config.yaml @@ -10,7 +10,9 @@ set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" - name: run test case (connection=ansible.netcommon.network_cli) - include: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli" + include_tasks: "file={{ test_case_to_run }}" + vars: + ansible_connection: ansible.netcommon.network_cli with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run diff --git a/test/integration/targets/incidental_vyos_config/tasks/main.yaml b/test/integration/targets/incidental_vyos_config/tasks/main.yaml index 13977a44b1c..0d4e8fdddca 100644 --- a/test/integration/targets/incidental_vyos_config/tasks/main.yaml +++ b/test/integration/targets/incidental_vyos_config/tasks/main.yaml @@ -1,3 +1,3 @@ --- -- {include: cli.yaml, tags: ['cli']} -- {include: cli_config.yaml, tags: ['cli_config']} +- {import_tasks: cli.yaml, tags: ['cli']} +- {import_tasks: cli_config.yaml, tags: ['cli_config']} diff --git a/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/cli.yaml b/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/cli.yaml index 83496e0e56c..c6923f3ef2d 100644 --- a/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/cli.yaml +++ b/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/cli.yaml @@ -11,7 +11,7 @@ set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" - name: Run test case (connection=ansible.netcommon.network_cli) - include: "{{ test_case_to_run }}" + include_tasks: "{{ test_case_to_run }}" vars: ansible_connection: ansible.netcommon.network_cli with_items: "{{ test_items }}" diff --git a/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/main.yaml b/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/main.yaml index d4cf26fc4a1..a6d418bb4a0 100644 --- a/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/main.yaml +++ b/test/integration/targets/incidental_vyos_lldp_interfaces/tasks/main.yaml @@ -1,2 +1,2 @@ --- -- {include: cli.yaml, tags: ['cli']} +- {import_tasks: cli.yaml, tags: ['cli']} diff --git a/test/integration/targets/incidental_win_data_deduplication/tasks/main.yml b/test/integration/targets/incidental_win_data_deduplication/tasks/main.yml index ae6be90ecb9..83c7197c643 100644 --- a/test/integration/targets/incidental_win_data_deduplication/tasks/main.yml +++ b/test/integration/targets/incidental_win_data_deduplication/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: pre_test.yml +- import_tasks: pre_test.yml diff --git a/test/integration/targets/incidental_win_data_deduplication/tasks/pre_test.yml b/test/integration/targets/incidental_win_data_deduplication/tasks/pre_test.yml index f72955e46bf..0d1c3d50ed9 100644 --- a/test/integration/targets/incidental_win_data_deduplication/tasks/pre_test.yml +++ b/test/integration/targets/incidental_win_data_deduplication/tasks/pre_test.yml @@ -34,7 +34,7 @@ - name: Run tests block: - - include: tests.yml + - import_tasks: tests.yml always: - name: Detach disk win_command: diskpart.exe /s {{ remote_tmp_dir }}\partition_deletion_script.txt diff --git a/test/integration/targets/rpm_key/tasks/main.yaml b/test/integration/targets/rpm_key/tasks/main.yaml index 9f6fd4ec605..6f71ca6eadb 100644 --- a/test/integration/targets/rpm_key/tasks/main.yaml +++ b/test/integration/targets/rpm_key/tasks/main.yaml @@ -1,2 +1,2 @@ - - include: 'rpm_key.yaml' + - include_tasks: 'rpm_key.yaml' when: ansible_os_family == "RedHat" diff --git a/test/integration/targets/task_ordering/tasks/main.yml b/test/integration/targets/task_ordering/tasks/main.yml index 4a7828bf425..a666006b7ab 100644 --- a/test/integration/targets/task_ordering/tasks/main.yml +++ b/test/integration/targets/task_ordering/tasks/main.yml @@ -1,7 +1,7 @@ - set_fact: temppath: "{{ remote_tmp_dir }}/output.txt" -- include: taskorder-include.yml +- include_tasks: taskorder-include.yml with_items: - 1 - 2 diff --git a/test/integration/targets/template/tasks/main.yml b/test/integration/targets/template/tasks/main.yml index da803436860..6d1a72c198d 100644 --- a/test/integration/targets/template/tasks/main.yml +++ b/test/integration/targets/template/tasks/main.yml @@ -716,4 +716,4 @@ that: "\"'y' is undefined\" in error.msg" # aliases file requires root for template tests so this should be safe -- include: backup_test.yml +- import_tasks: backup_test.yml