From ec7f885e2f23a29abbcf1107b0c21e91b78bc374 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 06:42:27 +0100 Subject: [PATCH] [PR #5996/24efe9ee backport][stable-6] Normalize bools in tests (#5997) Normalize bools in tests (#5996) * Normalize bools in tests. * Fix typo. (cherry picked from commit 24efe9ee9a39fb41bfe3a185c46450df19c5db31) Co-authored-by: Felix Fontein --- .../targets/aix_devices/tasks/main.yml | 4 +- .../targets/aix_filesystem/tasks/main.yml | 6 +- .../targets/archive/tasks/main.yml | 4 +- .../targets/archive/tests/broken-link.yml | 2 +- .../targets/archive/tests/remove.yml | 10 +- .../targets/cargo/tasks/test_general.yml | 2 +- .../cloud_init_data_facts/tasks/main.yml | 2 +- .../targets/connection/test_connection.yml | 2 +- tests/integration/targets/copr/tasks/main.yml | 2 +- .../integration/targets/cpanm/tasks/main.yml | 10 +- .../dnf_versionlock/tasks/lock_updates.yml | 2 +- .../targets/dpkg_divert/tasks/prepare.yml | 8 +- .../dpkg_divert/tasks/tests/01-basic.yml | 20 ++-- .../dpkg_divert/tasks/tests/02-rename.yml | 98 +++++++++---------- .../targets/filesize/tasks/basics.yml | 20 ++-- .../targets/filesize/tasks/errors.yml | 26 ++--- .../targets/filesize/tasks/floats.yml | 12 +-- .../targets/filesize/tasks/sparse.yml | 60 ++++++------ .../targets/filesize/tasks/symlinks.yml | 8 +- .../targets/filesystem/tasks/create_fs.yml | 6 +- .../filesystem/tasks/overwrite_another_fs.yml | 2 +- .../targets/filesystem/tasks/remove_fs.yml | 4 +- .../targets/filter_counter/tasks/main.yml | 4 +- .../targets/filter_random_mac/tasks/main.yml | 6 +- .../targets/filter_time/tasks/main.yml | 6 +- .../gandi_livedns/tasks/create_record.yml | 2 +- .../gandi_livedns/tasks/remove_record.yml | 2 +- .../gandi_livedns/tasks/update_record.yml | 2 +- tests/integration/targets/gem/tasks/main.yml | 16 +-- .../tasks/exclusion_state_list-all.yml | 2 +- .../targets/git_config/tasks/setup.yml | 4 +- .../git_config/tasks/unset_check_mode.yml | 2 +- .../gitlab_group_variable/tasks/main.yml | 6 +- .../gitlab_project_badge/tasks/main.yml | 6 +- .../gitlab_project_variable/tasks/main.yml | 6 +- tests/integration/targets/hg/tasks/main.yml | 2 +- .../targets/hg/tasks/run-tests.yml | 4 +- .../targets/hg/tasks/uninstall.yml | 4 +- .../targets/homebrew/tasks/main.yml | 24 ++--- .../targets/homebrew_cask/tasks/main.yml | 10 +- .../targets/homectl/tasks/main.yml | 26 ++--- .../targets/hwc_ecs_instance/tasks/main.yml | 6 +- .../targets/hwc_evs_disk/tasks/main.yml | 4 +- .../targets/hwc_vpc_eip/tasks/main.yml | 8 +- .../hwc_vpc_peering_connect/tasks/main.yml | 8 +- .../targets/hwc_vpc_port/tasks/main.yml | 6 +- .../targets/hwc_vpc_private_ip/tasks/main.yml | 8 +- .../targets/hwc_vpc_route/tasks/main.yml | 8 +- .../hwc_vpc_security_group/tasks/main.yml | 6 +- .../tasks/main.yml | 4 +- .../targets/hwc_vpc_subnet/tasks/main.yml | 8 +- .../targets/ini_file/tasks/tests/01-value.yml | 16 +-- .../ini_file/tasks/tests/02-values.yml | 2 +- .../targets/iptables_state/tasks/main.yml | 4 +- .../iptables_state/tasks/tests/00-basic.yml | 58 +++++------ .../iptables_state/tasks/tests/01-tables.yml | 28 +++--- .../tasks/tests/10-rollback.yml | 2 +- .../targets/ipwcli_dns/tasks/main.yml | 4 +- .../targets/iso_create/tasks/main.yml | 2 +- .../targets/iso_extract/tasks/7zip.yml | 6 +- .../targets/iso_extract/tasks/main.yml | 6 +- .../targets/java_cert/tasks/main.yml | 6 +- .../targets/java_cert/tasks/state_change.yml | 8 +- .../targets/java_keystore/tasks/tests.yml | 18 ++-- .../integration/targets/jboss/tasks/jboss.yml | 16 +-- .../targets/keycloak_client/tasks/main.yml | 2 +- .../targets/launchd/tasks/setup.yml | 4 +- .../targets/launchd/tasks/teardown.yml | 6 +- .../launchd/tasks/tests/test_reload.yml | 12 +-- .../launchd/tasks/tests/test_restart.yml | 8 +- .../launchd/tasks/tests/test_runatload.yml | 6 +- .../launchd/tasks/tests/test_start_stop.yml | 14 +-- .../launchd/tasks/tests/test_unload.yml | 10 +- .../targets/ldap_search/tasks/tests/basic.yml | 2 +- .../targets/lookup_dig/tasks/main.yml | 2 +- .../lookup_passwordstore/tasks/package.yml | 12 +-- .../lookup_passwordstore/tasks/tests.yml | 2 +- .../targets/lookup_random_pet/test.yml | 2 +- .../targets/lookup_random_string/test.yml | 4 +- .../targets/lvg/tasks/test_pvresize.yml | 8 +- tests/integration/targets/mail/tasks/main.yml | 6 +- tests/integration/targets/mas/tasks/main.yml | 12 +-- .../targets/module_helper/library/mstate.py | 2 +- .../targets/module_helper/tasks/mdepfail.yml | 2 +- .../targets/module_helper/tasks/msimple.yml | 2 +- .../tasks/msimple_output_conflict.yml | 2 +- .../integration/targets/monit/tasks/main.yml | 14 +-- .../targets/mssql_script/tasks/main.yml | 2 +- tests/integration/targets/npm/tasks/setup.yml | 2 +- .../targets/osx_defaults/tasks/main.yml | 10 +- .../targets/pacman/tasks/remove_nosave.yml | 2 +- .../targets/pam_limits/tasks/main.yml | 2 +- tests/integration/targets/pipx/tasks/main.yml | 8 +- .../pkgng/tasks/create-outofdate-pkg.yml | 4 +- .../targets/pkgng/tasks/freebsd.yml | 44 ++++----- .../pkgng/tasks/install_single_package.yml | 16 +-- .../targets/pkgng/tasks/setup-testjail.yml | 8 +- .../targets/pkgutil/tasks/main.yml | 8 +- .../targets/read_csv/tasks/main.yml | 8 +- .../targets/redis_info/tasks/main.yml | 2 +- .../targets/scaleway_compute/tasks/ip.yml | 6 +- .../scaleway_compute/tasks/security_group.yml | 4 +- .../targets/scaleway_compute/tasks/state.yml | 16 +-- .../targets/scaleway_container/tasks/main.yml | 8 +- .../tasks/main.yml | 8 +- .../tasks/main.yml | 6 +- .../scaleway_database_backup/tasks/main.yml | 10 +- .../targets/scaleway_function/tasks/main.yml | 8 +- .../tasks/main.yml | 8 +- .../targets/scaleway_ip/tasks/main.yml | 12 +-- .../targets/scaleway_lb/tasks/main.yml | 6 +- .../scaleway_security_group/tasks/main.yml | 4 +- .../targets/scaleway_sshkey/tasks/main.yml | 4 +- .../targets/scaleway_user_data/tasks/main.yml | 2 +- .../targets/sefcontext/tasks/sefcontext.yml | 12 +-- .../targets/setup_etcd3/tasks/main.yml | 2 +- .../targets/setup_gnutar/handlers/main.yml | 2 +- .../targets/setup_gnutar/tasks/main.yml | 2 +- .../targets/setup_mosquitto/tasks/ubuntu.yml | 2 +- .../targets/setup_pkg_mgr/tasks/main.yml | 6 +- .../setup_postgresql_db/tasks/main.yml | 8 +- .../tasks/default-cleanup.yml | 2 +- .../tasks/default-cleanup.yml | 2 +- .../setup_wildfly_server/handlers/main.yml | 2 +- .../setup_wildfly_server/tasks/main.yml | 14 +-- .../targets/shutdown/tasks/main.yml | 4 +- .../targets/ssh_config/tasks/main.yml | 6 +- .../targets/ssh_config/tasks/options.yml | 6 +- .../supervisorctl/tasks/install_Linux.yml | 2 +- .../integration/targets/sysrc/tasks/main.yml | 14 +-- .../targets/sysrc/tasks/setup-testjail.yml | 4 +- .../terraform/tasks/complex_variables.yml | 2 +- .../targets/terraform/tasks/main.yml | 2 +- .../terraform/tasks/test_provider_upgrade.yml | 4 +- .../targets/terraform/vars/main.yml | 4 +- .../targets/timezone/tasks/test.yml | 44 ++++----- tests/integration/targets/ufw/tasks/main.yml | 6 +- .../targets/ufw/tasks/tests/basic.yml | 78 +++++++-------- .../targets/ufw/tasks/tests/global-state.yml | 26 ++--- .../targets/ufw/tasks/tests/interface.yml | 8 +- .../targets/wakeonlan/tasks/main.yml | 6 +- .../integration/targets/xattr/tasks/main.yml | 2 +- .../targets/xfs_quota/tasks/main.yml | 4 +- .../test-add-children-elements-unicode.yml | 4 +- .../xml/tasks/test-add-children-elements.yml | 4 +- .../test-add-children-from-groupvars.yml | 4 +- .../tasks/test-add-children-insertafter.yml | 8 +- .../tasks/test-add-children-insertbefore.yml | 8 +- ...t-add-children-with-attributes-unicode.yml | 4 +- .../test-add-children-with-attributes.yml | 4 +- .../xml/tasks/test-add-element-implicitly.yml | 24 ++--- .../test-add-namespaced-children-elements.yml | 4 +- .../xml/tasks/test-children-elements-xml.yml | 4 +- .../targets/xml/tasks/test-count-unicode.yml | 2 +- .../targets/xml/tasks/test-count.yml | 2 +- .../test-mutually-exclusive-attributes.yml | 2 +- .../xml/tasks/test-pretty-print-only.yml | 6 +- .../targets/xml/tasks/test-pretty-print.yml | 6 +- .../tasks/test-remove-attribute-nochange.yml | 4 +- .../xml/tasks/test-remove-attribute.yml | 4 +- .../tasks/test-remove-element-nochange.yml | 4 +- .../targets/xml/tasks/test-remove-element.yml | 4 +- ...t-remove-namespaced-attribute-nochange.yml | 4 +- .../test-remove-namespaced-attribute.yml | 4 +- ...est-remove-namespaced-element-nochange.yml | 4 +- .../tasks/test-remove-namespaced-element.yml | 4 +- .../test-set-attribute-value-unicode.yml | 4 +- .../xml/tasks/test-set-attribute-value.yml | 4 +- .../test-set-children-elements-level.yml | 8 +- .../test-set-children-elements-unicode.yml | 8 +- .../xml/tasks/test-set-children-elements.yml | 12 +-- .../tasks/test-set-element-value-empty.yml | 4 +- .../tasks/test-set-element-value-unicode.yml | 4 +- .../xml/tasks/test-set-element-value.yml | 4 +- .../test-set-namespaced-attribute-value.yml | 4 +- .../test-set-namespaced-children-elements.yml | 10 +- .../test-set-namespaced-element-value.yml | 4 +- .../targets/xml/tasks/test-xmlstring.yml | 16 +-- tests/integration/targets/yarn/tasks/run.yml | 4 +- .../targets/yum_versionlock/tasks/main.yml | 2 +- .../targets/zypper/tasks/zypper.yml | 16 +-- .../tasks/zypper_repository.yml | 4 +- 182 files changed, 770 insertions(+), 770 deletions(-) diff --git a/tests/integration/targets/aix_devices/tasks/main.yml b/tests/integration/targets/aix_devices/tasks/main.yml index d007e9b611..c2b829d42f 100644 --- a/tests/integration/targets/aix_devices/tasks/main.yml +++ b/tests/integration/targets/aix_devices/tasks/main.yml @@ -47,13 +47,13 @@ - name: Put vscsi1 and children devices in Defined state. aix_devices: device: vscsi1 - recursive: yes + recursive: true state: defined - name: Removes vscsi1 and children devices. aix_devices: device: vscsi1 - recursive: yes + recursive: true state: absent - name: Changes en1 mtu to 9000 and disables arp. diff --git a/tests/integration/targets/aix_filesystem/tasks/main.yml b/tests/integration/targets/aix_filesystem/tasks/main.yml index e17ec4d263..25146062d6 100644 --- a/tests/integration/targets/aix_filesystem/tasks/main.yml +++ b/tests/integration/targets/aix_filesystem/tasks/main.yml @@ -104,7 +104,7 @@ - name: Remove NFS filesystem /home/ftp aix_filesystem: filesystem: /home/ftp - rm_mount_point: yes + rm_mount_point: true state: absent - name: Mount filesystem /newfs @@ -115,7 +115,7 @@ - name: Remove mounted /newfs aix_filesystem: filesystem: /newfs - rm_mount_point: yes + rm_mount_point: true state: absent - name: Umount /newfs @@ -126,5 +126,5 @@ - name: Remove /newfs aix_filesystem: filesystem: /newfs - rm_mount_point: yes + rm_mount_point: true state: absent diff --git a/tests/integration/targets/archive/tasks/main.yml b/tests/integration/targets/archive/tasks/main.yml index 4043f95b62..afe278bcf4 100644 --- a/tests/integration/targets/archive/tasks/main.yml +++ b/tests/integration/targets/archive/tasks/main.yml @@ -78,8 +78,8 @@ homebrew: name: xz state: present - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" # Newer versions of brew want to compile a package which takes a long time. Do not upgrade homebrew until a # proper solution can be found diff --git a/tests/integration/targets/archive/tests/broken-link.yml b/tests/integration/targets/archive/tests/broken-link.yml index 8f8b534d58..7c64443719 100644 --- a/tests/integration/targets/archive/tests/broken-link.yml +++ b/tests/integration/targets/archive/tests/broken-link.yml @@ -9,7 +9,7 @@ src: /nowhere dest: "{{ remote_tmp_dir }}/nowhere.txt" state: link - force: yes + force: true - name: Archive - broken link ({{ format }}) archive: diff --git a/tests/integration/targets/archive/tests/remove.yml b/tests/integration/targets/archive/tests/remove.yml index b58046af6a..8f0b8cff86 100644 --- a/tests/integration/targets/archive/tests/remove.yml +++ b/tests/integration/targets/archive/tests/remove.yml @@ -8,7 +8,7 @@ path: "{{ remote_tmp_dir }}/*.txt" dest: "{{ remote_tmp_dir }}/archive_remove_source_files.{{ format }}" format: "{{ format }}" - remove: yes + remove: true register: archive_remove_source_files - name: Verify archive exists - remove source files ({{ format }}) @@ -64,7 +64,7 @@ path: "{{ remote_tmp_dir }}/tmpdir" dest: "{{ remote_tmp_dir }}/archive_remove_source_directory.{{ format }}" format: "{{ format }}" - remove: yes + remove: true register: archive_remove_source_directory - name: Verify archive exists - remove source directory ({{ format }}) @@ -107,7 +107,7 @@ path: "{{ remote_tmp_dir }}/tmpdir/*" dest: "{{ remote_tmp_dir }}/archive_remove_source_excluding_path.{{ format }}" format: "{{ format }}" - remove: yes + remove: true exclude_path: "{{ remote_tmp_dir }}/tmpdir/empty.txt" register: archive_remove_source_excluding_path @@ -150,7 +150,7 @@ - "{{ remote_tmp_dir }}/tmpdir/sub/*" dest: "{{ remote_tmp_dir }}/archive_remove_source_excluding_sub_path.{{ format }}" format: "{{ format }}" - remove: yes + remove: true exclude_path: "{{ remote_tmp_dir }}/tmpdir/sub/subfile.txt" register: archive_remove_source_excluding_sub_path @@ -185,7 +185,7 @@ path: "{{ remote_tmp_dir }}/tmpdir/" dest: "{{ remote_tmp_dir }}/archive_remove_source_nested_paths.{{ format }}" format: "{{ format }}" - remove: yes + remove: true register: archive_remove_nested_paths - name: Verify archive exists - remove source with nested paths ({{ format }}) diff --git a/tests/integration/targets/cargo/tasks/test_general.yml b/tests/integration/targets/cargo/tasks/test_general.yml index e07264b517..2bffa08f0d 100644 --- a/tests/integration/targets/cargo/tasks/test_general.yml +++ b/tests/integration/targets/cargo/tasks/test_general.yml @@ -18,7 +18,7 @@ community.general.cargo: name: helloworld register: install_present_helloworld - ignore_errors: yes + ignore_errors: true - name: Uninstall application helloworld community.general.cargo: diff --git a/tests/integration/targets/cloud_init_data_facts/tasks/main.yml b/tests/integration/targets/cloud_init_data_facts/tasks/main.yml index fe38d4ca5b..40e762d689 100644 --- a/tests/integration/targets/cloud_init_data_facts/tasks/main.yml +++ b/tests/integration/targets/cloud_init_data_facts/tasks/main.yml @@ -42,7 +42,7 @@ - name: test gather cloud-init facts in check mode cloud_init_data_facts: - check_mode: yes + check_mode: true register: result - name: verify test gather cloud-init facts in check mode assert: diff --git a/tests/integration/targets/connection/test_connection.yml b/tests/integration/targets/connection/test_connection.yml index 157a7821ba..bb0a993995 100644 --- a/tests/integration/targets/connection/test_connection.yml +++ b/tests/integration/targets/connection/test_connection.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - hosts: "{{ target_hosts }}" - gather_facts: no + gather_facts: false serial: 1 tasks: diff --git a/tests/integration/targets/copr/tasks/main.yml b/tests/integration/targets/copr/tasks/main.yml index 917e44b7ec..0e46517240 100644 --- a/tests/integration/targets/copr/tasks/main.yml +++ b/tests/integration/targets/copr/tasks/main.yml @@ -34,7 +34,7 @@ - result.info == 'Please note that this repository is not part of the main distribution' - name: enable copr project - check_mode: yes + check_mode: true copr: state: enabled name: '{{ copr_fullname }}' diff --git a/tests/integration/targets/cpanm/tasks/main.yml b/tests/integration/targets/cpanm/tasks/main.yml index ed3c02b692..c9adc1ca6b 100644 --- a/tests/integration/targets/cpanm/tasks/main.yml +++ b/tests/integration/targets/cpanm/tasks/main.yml @@ -15,7 +15,7 @@ - perl-devel - perl-App-cpanminus state: present - become: yes + become: true when: ansible_os_family == "RedHat" - name: install perl development package for Debian family @@ -23,13 +23,13 @@ name: - cpanminus state: present - become: yes + become: true when: ansible_os_family == "Debian" - name: install a Perl package cpanm: name: JSON - notest: yes + notest: true register: install_perl_package_result - name: assert package is installed @@ -41,7 +41,7 @@ - name: install same Perl package cpanm: name: JSON - notest: yes + notest: true register: install_same_perl_package_result - name: assert same package is installed @@ -54,7 +54,7 @@ cpanm: name: JSON version: "@4.01" - notest: yes + notest: true mode: new register: install_perl_package_with_version_op_result diff --git a/tests/integration/targets/dnf_versionlock/tasks/lock_updates.yml b/tests/integration/targets/dnf_versionlock/tasks/lock_updates.yml index edbfcabd40..b3fceb26f5 100644 --- a/tests/integration/targets/dnf_versionlock/tasks/lock_updates.yml +++ b/tests/integration/targets/dnf_versionlock/tasks/lock_updates.yml @@ -63,7 +63,7 @@ dnf: name: "{{ _packages }}" state: latest - check_mode: yes + check_mode: true register: update_packages - assert: diff --git a/tests/integration/targets/dpkg_divert/tasks/prepare.yml b/tests/integration/targets/dpkg_divert/tasks/prepare.yml index 7697d0fd2d..94566b41e1 100644 --- a/tests/integration/targets/dpkg_divert/tasks/prepare.yml +++ b/tests/integration/targets/dpkg_divert/tasks/prepare.yml @@ -19,7 +19,7 @@ dpkg_divert: path: "{{ foobarrc }}" state: absent - become: yes + become: true - name: "remove test files" file: @@ -30,7 +30,7 @@ - "{{ foobarrc_distrib }}" loop_control: loop_var: dpkg_divert_item - become: yes + become: true - block: @@ -39,5 +39,5 @@ - name: "include tasks to perform other tests (rename)" include_tasks: tests/02-rename.yml - become: yes - diff: yes + become: true + diff: true diff --git a/tests/integration/targets/dpkg_divert/tasks/tests/01-basic.yml b/tests/integration/targets/dpkg_divert/tasks/tests/01-basic.yml index 0668a8aa02..78863d1db8 100644 --- a/tests/integration/targets/dpkg_divert/tasks/tests/01-basic.yml +++ b/tests/integration/targets/dpkg_divert/tasks/tests/01-basic.yml @@ -46,14 +46,14 @@ dpkg_divert: path: "{{ foobarrc }}" state: present - rename: yes + rename: true register: diversion_4 - name: "divert foobarrc (check mode, rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" state: present - rename: yes + rename: true register: diversion_5 check_mode: true @@ -88,7 +88,7 @@ - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - diversion_4.commands == diversion_5.commands - quiet: yes + quiet: true ################################################################################ @@ -148,7 +148,7 @@ - diversion_2.diversion == diversion_3.diversion - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - quiet: yes + quiet: true ################################################################################ @@ -164,7 +164,7 @@ path: "{{ foobarrc }}" holder: "ansible" register: diversion_0 - check_mode: yes + check_mode: true - name: "update foobarrc diversion holder (must report a change)" dpkg_divert: @@ -184,7 +184,7 @@ path: "{{ foobarrc }}" holder: "ansible" register: diversion_3 - check_mode: yes + check_mode: true # Check results @@ -213,7 +213,7 @@ - diversion_2.diversion == diversion_3.diversion - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - quiet: yes + quiet: true - name: "remove foobarrc diversion" dpkg_divert: @@ -234,7 +234,7 @@ path: "{{ foobarrc }}" divert: "{{ foobarrc_ansible }}" register: diversion_0 - check_mode: yes + check_mode: true - name: "update foobarrc divert path (must report a change)" dpkg_divert: @@ -254,7 +254,7 @@ path: "{{ foobarrc }}" divert: "{{ foobarrc_ansible }}" register: diversion_3 - check_mode: yes + check_mode: true # Check results @@ -283,7 +283,7 @@ - diversion_2.diversion == diversion_3.diversion - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - quiet: yes + quiet: true - name: "remove foobarrc diversion" dpkg_divert: diff --git a/tests/integration/targets/dpkg_divert/tasks/tests/02-rename.yml b/tests/integration/targets/dpkg_divert/tasks/tests/02-rename.yml index 077004029d..6c95a72912 100644 --- a/tests/integration/targets/dpkg_divert/tasks/tests/02-rename.yml +++ b/tests/integration/targets/dpkg_divert/tasks/tests/02-rename.yml @@ -9,29 +9,29 @@ - name: "create diversion for foobarrc (check mode, rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true register: diversion_0 - check_mode: yes + check_mode: true - name: "create diversion for foobarrc (rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true register: diversion_1 - name: "create diversion for foobarrc (rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true register: diversion_2 - name: "create diversion for foobarrc (check mode, rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true register: diversion_3 - check_mode: yes + check_mode: true # Get results @@ -60,7 +60,7 @@ - diversion_2.diversion == diversion_3.diversion - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - quiet: yes + quiet: true ################################################################################ @@ -69,15 +69,15 @@ - name: "remove diversion for foobarrc (check mode, rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true state: absent register: diversion_0 - check_mode: yes + check_mode: true - name: "remove diversion for foobarrc (rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true state: absent register: diversion_1 @@ -85,17 +85,17 @@ - name: "remove diversion for foobarrc (rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true state: absent register: diversion_2 - name: "remove diversion for foobarrc (check mode, rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true state: absent register: diversion_3 - check_mode: yes + check_mode: true # Check results @@ -124,7 +124,7 @@ - diversion_2.diversion == diversion_3.diversion - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - quiet: yes + quiet: true ################################################################################ @@ -139,49 +139,49 @@ - name: "create diversion for foobarrc (check mode, rename, must fail)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true register: diversion_0 - ignore_errors: yes - check_mode: yes + ignore_errors: true + check_mode: true - name: "create diversion for foobarrc (rename, must fail)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes + rename: true register: diversion_1 - ignore_errors: yes + ignore_errors: true - name: "create diversion for foobarrc (check mode, force rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes - force: yes + rename: true + force: true register: diversion_2 - check_mode: yes + check_mode: true - name: "create diversion for foobarrc (force rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes - force: yes + rename: true + force: true register: diversion_3 - name: "create diversion for foobarrc (force rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes - force: yes + rename: true + force: true register: diversion_4 - name: "create diversion for foobarrc (check mode, force rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" - rename: yes - force: yes + rename: true + force: true register: diversion_5 - check_mode: yes + check_mode: true # Check results @@ -213,7 +213,7 @@ - diversion_4.diversion == diversion_5.diversion - diversion_2.commands == diversion_3.commands - diversion_4.commands == diversion_5.commands - quiet: yes + quiet: true ################################################################################ @@ -230,7 +230,7 @@ path: "{{ foobarrc }}" divert: "{{ foobarrc_ansible }}" register: diversion_0 - check_mode: yes + check_mode: true - name: "create diversion for foobarrc (update divert path, must report a change)" dpkg_divert: @@ -250,7 +250,7 @@ path: "{{ foobarrc }}" divert: "{{ foobarrc_ansible }}" register: diversion_3 - check_mode: yes + check_mode: true # Check results @@ -286,7 +286,7 @@ - diversion_2.diversion == diversion_3.diversion - diversion_0.commands == diversion_1.commands - diversion_2.commands == diversion_3.commands - quiet: yes + quiet: true ################################################################################ @@ -296,35 +296,35 @@ dpkg_divert: path: "{{ foobarrc }}" state: absent - rename: yes + rename: true register: diversion_0 - ignore_errors: yes - check_mode: yes + ignore_errors: true + check_mode: true - name: "remove diversion for foobarrc (rename, must fail)" dpkg_divert: path: "{{ foobarrc }}" state: absent - rename: yes + rename: true register: diversion_1 - ignore_errors: yes + ignore_errors: true - name: "remove diversion for foobarrc (check mode, force rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" state: absent - rename: yes - force: yes + rename: true + force: true register: diversion_2 - check_mode: yes + check_mode: true - name: "remove diversion for foobarrc (force rename, must report a change)" dpkg_divert: path: "{{ foobarrc }}" state: absent - rename: yes - force: yes + rename: true + force: true register: diversion_3 @@ -332,18 +332,18 @@ dpkg_divert: path: "{{ foobarrc }}" state: absent - rename: yes - force: yes + rename: true + force: true register: diversion_4 - name: "remove diversion for foobarrc (check mode, force rename, must NOT report a change, idempotency)" dpkg_divert: path: "{{ foobarrc }}" state: absent - rename: yes - force: yes + rename: true + force: true register: diversion_5 - check_mode: yes + check_mode: true # Check results @@ -381,4 +381,4 @@ - diversion_4.diversion == diversion_5.diversion - diversion_2.commands == diversion_3.commands - diversion_4.commands == diversion_5.commands - quiet: yes + quiet: true diff --git a/tests/integration/targets/filesize/tasks/basics.yml b/tests/integration/targets/filesize/tasks/basics.yml index ac99778a30..3c06731899 100644 --- a/tests/integration/targets/filesize/tasks/basics.yml +++ b/tests/integration/targets/filesize/tasks/basics.yml @@ -14,7 +14,7 @@ path: "{{ filesize_testfile }}" size: 0 register: filesize_test_basic_01 - check_mode: yes + check_mode: true - name: Stat the file (should not exist) ansible.builtin.stat: @@ -39,7 +39,7 @@ path: "{{ filesize_testfile }}" size: 0G register: filesize_test_basic_03 - check_mode: yes + check_mode: true - name: Create an empty file (idempotency) community.general.filesize: @@ -102,7 +102,7 @@ size: 57kB source: /dev/urandom register: filesize_test_basic_11 - check_mode: yes + check_mode: true - name: Stat the file (should still be unchanged) ansible.builtin.stat: @@ -133,7 +133,7 @@ size: 57000B source: /dev/urandom register: filesize_test_basic_13 - check_mode: yes + check_mode: true - name: Fill the file up to 57000B (57kB) with random data (idempotency) community.general.filesize: @@ -183,7 +183,7 @@ path: "{{ filesize_testfile }}" size: 57001B register: filesize_test_basic_21 - check_mode: yes + check_mode: true - name: Stat the file again (should remain the same) ansible.builtin.stat: @@ -208,7 +208,7 @@ path: "{{ filesize_testfile }}" size: 57.001 kB register: filesize_test_basic_23 - check_mode: yes + check_mode: true - name: Expand the file with 1 byte (57.001 kB) (idempotency) community.general.filesize: @@ -259,7 +259,7 @@ path: "{{ filesize_testfile }}" size: 2 MiB register: filesize_test_basic_31 - check_mode: yes + check_mode: true - name: Stat the file again (should remain the same) ansible.builtin.stat: @@ -285,7 +285,7 @@ size: 2 blocksize: 1M register: filesize_test_basic_33 - check_mode: yes + check_mode: true - name: Expand the file up to 2×1M (2*1024*1024 bytes) (idempotency) community.general.filesize: @@ -333,7 +333,7 @@ path: "{{ filesize_testfile }}" size: 57kB register: filesize_test_basic_41 - check_mode: yes + check_mode: true - name: Stat the resulting file (should be unchanged) ansible.builtin.stat: @@ -358,7 +358,7 @@ path: "{{ filesize_testfile }}" size: 57000 B register: filesize_test_basic_43 - check_mode: yes + check_mode: true - name: Truncate the file to 57000 B (57kB) (idempotency) community.general.filesize: diff --git a/tests/integration/targets/filesize/tasks/errors.yml b/tests/integration/targets/filesize/tasks/errors.yml index ba65934e5a..351a90ac6c 100644 --- a/tests/integration/targets/filesize/tasks/errors.yml +++ b/tests/integration/targets/filesize/tasks/errors.yml @@ -11,24 +11,24 @@ community.general.filesize: size: 1kB register: filesize_test_error_01 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to missing parameter (size) community.general.filesize: path: "{{ filesize_testfile }}" register: filesize_test_error_02 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to conflicting parameters (force|sparse) community.general.filesize: path: "{{ filesize_testfile }}" size: 1MB - force: yes - sparse: yes + force: true + sparse: true register: filesize_test_error_03 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid file path (not a file) @@ -36,7 +36,7 @@ path: "{{ filesize_testdir }}" size: 4096B register: filesize_test_error_04 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid file path (unexisting parent dir) @@ -44,7 +44,7 @@ path: "/unexistent/{{ filesize_testfile }}" size: 4096B register: filesize_test_error_05 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid size unit (b)" @@ -52,7 +52,7 @@ path: "{{ filesize_testfile }}" size: 4096b register: filesize_test_error_06 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid size value (bytes require integer) @@ -60,7 +60,7 @@ path: "{{ filesize_testfile }}" size: 1000.5B register: filesize_test_error_07 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid blocksize value (not an integer) @@ -69,7 +69,7 @@ size: 1M blocksize: "12.5" register: filesize_test_error_08 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid blocksize value type (dict) @@ -79,7 +79,7 @@ blocksize: bytes: 512 register: filesize_test_error_09 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid source device (/dev/unexistent) @@ -88,7 +88,7 @@ size: 1M source: /dev/unexistent register: filesize_test_error_10 - ignore_errors: yes + ignore_errors: true - name: Trigger an error due to invalid source device (/dev/null) @@ -97,7 +97,7 @@ size: 1M source: /dev/null register: filesize_test_error_11 - ignore_errors: yes + ignore_errors: true - name: Assert that expected errors have been triggered diff --git a/tests/integration/targets/filesize/tasks/floats.yml b/tests/integration/targets/filesize/tasks/floats.yml index d7b5a4c9a7..6d1bde22c9 100644 --- a/tests/integration/targets/filesize/tasks/floats.yml +++ b/tests/integration/targets/filesize/tasks/floats.yml @@ -14,7 +14,7 @@ path: "{{ filesize_testfile }}" size: 512.512kB register: filesize_test_float_01 - check_mode: yes + check_mode: true - name: Stat the file (should not exist) ansible.builtin.stat: @@ -39,7 +39,7 @@ path: "{{ filesize_testfile }}" size: 0.512512MB register: filesize_test_float_03 - check_mode: yes + check_mode: true - name: Create a file with a size of 0.512512MB (idempotency) community.general.filesize: @@ -95,7 +95,7 @@ path: "{{ filesize_testfile }}" size: 512.513kB register: filesize_test_float_11 - check_mode: yes + check_mode: true - name: Stat the file again (should remain the same) ansible.builtin.stat: @@ -120,7 +120,7 @@ path: "{{ filesize_testfile }}" size: 0.512513MB register: filesize_test_float_13 - check_mode: yes + check_mode: true - name: Create a file with a size of 0.512513MB (idempotency) community.general.filesize: @@ -172,7 +172,7 @@ path: "{{ filesize_testfile }}" size: 4.004MB register: filesize_test_float_21 - check_mode: yes + check_mode: true - name: Stat the file again (should remain the same) ansible.builtin.stat: @@ -197,7 +197,7 @@ path: "{{ filesize_testfile }}" size: 4.004MB register: filesize_test_float_23 - check_mode: yes + check_mode: true - name: Create a file with a size of 4.004MB (idempotency) community.general.filesize: diff --git a/tests/integration/targets/filesize/tasks/sparse.yml b/tests/integration/targets/filesize/tasks/sparse.yml index 9a8a9cfe90..79145b6e23 100644 --- a/tests/integration/targets/filesize/tasks/sparse.yml +++ b/tests/integration/targets/filesize/tasks/sparse.yml @@ -9,14 +9,14 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4TB - sparse: yes + sparse: true register: filesize_test_sparse_01 - check_mode: yes + check_mode: true - name: Stat the file (should not exist) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_01 @@ -24,13 +24,13 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4TB - sparse: yes + sparse: true register: filesize_test_sparse_02 - name: Stat the resulting file (should exist now) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_02 @@ -38,15 +38,15 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4000GB - sparse: yes + sparse: true register: filesize_test_sparse_03 - check_mode: yes + check_mode: true - name: Create a huge sparse file of 4TB (4000GB) (idempotency) community.general.filesize: path: "{{ filesize_testfile }}" size: 4000GB - sparse: yes + sparse: true register: filesize_test_sparse_04 - name: Create a huge sparse file of 4TB (4000000 × 1MB) (check mode, idempotency) @@ -54,22 +54,22 @@ path: "{{ filesize_testfile }}" size: 4000000 blocksize: 1MB - sparse: yes + sparse: true register: filesize_test_sparse_05 - check_mode: yes + check_mode: true - name: Create a huge sparse file of 4TB (4000000 × 1MB) (idempotency) community.general.filesize: path: "{{ filesize_testfile }}" size: 4000000 blocksize: 1MB - sparse: yes + sparse: true register: filesize_test_sparse_06 - name: Stat the file again (should remain the same) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_06 @@ -124,14 +124,14 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4TiB - sparse: yes + sparse: true register: filesize_test_sparse_11 - check_mode: yes + check_mode: true - name: Stat the file again (should remain the same) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_11 @@ -139,13 +139,13 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4TiB - sparse: yes + sparse: true register: filesize_test_sparse_12 - name: Stat the file again (should have grown) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_12 @@ -153,21 +153,21 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4096GiB - sparse: yes + sparse: true register: filesize_test_sparse_13 - check_mode: yes + check_mode: true - name: Change sparse file size to 4TiB (4096GiB) (idempotency) community.general.filesize: path: "{{ filesize_testfile }}" size: 4096GiB - sparse: yes + sparse: true register: filesize_test_sparse_14 - name: Stat the file again (should remain the same) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_14 @@ -203,14 +203,14 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4.321TB - sparse: yes + sparse: true register: filesize_test_sparse_21 - check_mode: yes + check_mode: true - name: Stat the file again (should remain the same) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_21 @@ -218,13 +218,13 @@ community.general.filesize: path: "{{ filesize_testfile }}" size: 4.321TB - sparse: yes + sparse: true register: filesize_test_sparse_22 - name: Stat the file again (should have been reduced) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_22 @@ -233,22 +233,22 @@ path: "{{ filesize_testfile }}" size: 4321 blocksize: 1GB - sparse: yes + sparse: true register: filesize_test_sparse_23 - check_mode: yes + check_mode: true - name: Change sparse file size to 4321×1GB (idempotency) community.general.filesize: path: "{{ filesize_testfile }}" size: 4321 blocksize: 1GB - sparse: yes + sparse: true register: filesize_test_sparse_24 - name: Stat the file again (should remain the same) ansible.builtin.stat: path: "{{ filesize_testfile }}" - get_checksum: no + get_checksum: false register: filesize_stat_sparse_24 diff --git a/tests/integration/targets/filesize/tasks/symlinks.yml b/tests/integration/targets/filesize/tasks/symlinks.yml index ee75777101..0118896568 100644 --- a/tests/integration/targets/filesize/tasks/symlinks.yml +++ b/tests/integration/targets/filesize/tasks/symlinks.yml @@ -16,8 +16,8 @@ src: "{{ filesize_testfile | basename }}" dest: "{{ filesize_testlink }}" state: link - force: yes - follow: no + force: true + follow: false @@ -26,7 +26,7 @@ path: "{{ filesize_testlink }}" size: "512 kB" register: filesize_test_symlink_01 - check_mode: yes + check_mode: true - name: Create a file with a size of 512 kB (512000 bytes) community.general.filesize: @@ -45,7 +45,7 @@ path: "{{ filesize_testlink }}" size: "500 KiB" register: filesize_test_symlink_03 - check_mode: yes + check_mode: true - name: Create a file with a size of 500 KiB (512000 bytes) (idempotency) community.general.filesize: diff --git a/tests/integration/targets/filesystem/tasks/create_fs.yml b/tests/integration/targets/filesystem/tasks/create_fs.yml index 82f92f4cc3..d5470fa56b 100644 --- a/tests/integration/targets/filesystem/tasks/create_fs.yml +++ b/tests/integration/targets/filesystem/tasks/create_fs.yml @@ -44,7 +44,7 @@ community.general.filesystem: dev: '{{ dev }}' fstype: '{{ fstype }}' - force: yes + force: true register: fs3_result - name: "Get UUID of the new filesystem" @@ -84,7 +84,7 @@ community.general.filesystem: dev: '{{ dev }}' fstype: '{{ fstype }}' - resizefs: yes + resizefs: true register: fs4_result - name: "Get UUID of the filesystem" @@ -109,7 +109,7 @@ community.general.filesystem: dev: '{{ dev }}' fstype: '{{ fstype }}' - resizefs: yes + resizefs: true register: fs5_result - name: "Assert that the state did not change" diff --git a/tests/integration/targets/filesystem/tasks/overwrite_another_fs.yml b/tests/integration/targets/filesystem/tasks/overwrite_another_fs.yml index 25bc9a0699..de0ad4d66b 100644 --- a/tests/integration/targets/filesystem/tasks/overwrite_another_fs.yml +++ b/tests/integration/targets/filesystem/tasks/overwrite_another_fs.yml @@ -42,7 +42,7 @@ community.general.filesystem: dev: '{{ dev }}' fstype: '{{ fstype }}' - force: yes + force: true register: fs_result2 - name: 'Get UUID of the new filesystem' diff --git a/tests/integration/targets/filesystem/tasks/remove_fs.yml b/tests/integration/targets/filesystem/tasks/remove_fs.yml index aaa78ae563..c5428b309f 100644 --- a/tests/integration/targets/filesystem/tasks/remove_fs.yml +++ b/tests/integration/targets/filesystem/tasks/remove_fs.yml @@ -28,7 +28,7 @@ dev: '{{ dev }}' state: absent register: wipefs - check_mode: yes + check_mode: true - name: "Get filesystem UUID with 'blkid' (should remain the same)" ansible.builtin.shell: @@ -81,7 +81,7 @@ dev: '{{ dev }}' state: absent register: wipefs - check_mode: yes + check_mode: true - name: "Assert that the state did not change" ansible.builtin.assert: diff --git a/tests/integration/targets/filter_counter/tasks/main.yml b/tests/integration/targets/filter_counter/tasks/main.yml index 881d55d2f6..77d6b1b020 100644 --- a/tests/integration/targets/filter_counter/tasks/main.yml +++ b/tests/integration/targets/filter_counter/tasks/main.yml @@ -19,7 +19,7 @@ - name: test fail argument not a sequence debug: msg: "{{ {'a': 'b'} | community.general.counter }}" - ignore_errors: yes + ignore_errors: true register: res - name: verify test fail argument not a sequence @@ -31,7 +31,7 @@ - name: test fail element not hashable debug: msg: "{{ [{'a': 'b'}] | community.general.counter }}" - ignore_errors: yes + ignore_errors: true register: res - name: verify test fail element not hashable diff --git a/tests/integration/targets/filter_random_mac/tasks/main.yml b/tests/integration/targets/filter_random_mac/tasks/main.yml index f9f85e986b..230f9776d5 100644 --- a/tests/integration/targets/filter_random_mac/tasks/main.yml +++ b/tests/integration/targets/filter_random_mac/tasks/main.yml @@ -13,7 +13,7 @@ debug: var: "0 | community.general.random_mac" register: _bad_random_mac_filter - ignore_errors: yes + ignore_errors: true - name: Verify random_mac filter showed a bad argument type error message assert: @@ -25,7 +25,7 @@ debug: var: "'dummy' | community.general.random_mac" register: _bad_random_mac_filter - ignore_errors: yes + ignore_errors: true - name: Verify random_mac filter showed a bad argument value error message assert: @@ -37,7 +37,7 @@ debug: var: "'00:00:00:00:00:00' | community.general.random_mac" register: _bad_random_mac_filter - ignore_errors: yes + ignore_errors: true - name: Verify random_mac filter showed a prefix too big error message assert: diff --git a/tests/integration/targets/filter_time/tasks/main.yml b/tests/integration/targets/filter_time/tasks/main.yml index bd8c53ac31..3b6539499e 100644 --- a/tests/integration/targets/filter_time/tasks/main.yml +++ b/tests/integration/targets/filter_time/tasks/main.yml @@ -81,7 +81,7 @@ - name: test fail unknown unit debug: msg: "{{ '1s' | community.general.to_time_unit('lightyears') }}" - ignore_errors: yes + ignore_errors: true register: res - name: verify test fail unknown unit @@ -93,7 +93,7 @@ - name: test fail unknown string debug: msg: "{{ '1 s' | community.general.to_time_unit('s') }}" - ignore_errors: yes + ignore_errors: true register: res - name: test fail unknown string @@ -105,7 +105,7 @@ - name: test fail unknown kwarg debug: msg: "{{ '1s' | community.general.to_time_unit('s', second=23) }}" - ignore_errors: yes + ignore_errors: true register: res - name: test fail unknown kwarg diff --git a/tests/integration/targets/gandi_livedns/tasks/create_record.yml b/tests/integration/targets/gandi_livedns/tasks/create_record.yml index 9d764a4198..c3f1c17981 100644 --- a/tests/integration/targets/gandi_livedns/tasks/create_record.yml +++ b/tests/integration/targets/gandi_livedns/tasks/create_record.yml @@ -25,7 +25,7 @@ values: "{{ item['values'] }}" ttl: "{{ item.ttl }}" type: "{{ item.type }}" - check_mode: yes + check_mode: true register: result - name: verify test create a dns record in check mode assert: diff --git a/tests/integration/targets/gandi_livedns/tasks/remove_record.yml b/tests/integration/targets/gandi_livedns/tasks/remove_record.yml index 6f497d2375..c4b937fd5a 100644 --- a/tests/integration/targets/gandi_livedns/tasks/remove_record.yml +++ b/tests/integration/targets/gandi_livedns/tasks/remove_record.yml @@ -11,7 +11,7 @@ values: "{{ item.update_values | default(item['values']) }}" type: "{{ item.type }}" state: absent - check_mode: yes + check_mode: true register: result - name: verify test remove a dns record in check mode assert: diff --git a/tests/integration/targets/gandi_livedns/tasks/update_record.yml b/tests/integration/targets/gandi_livedns/tasks/update_record.yml index 7489059de1..a080560a75 100644 --- a/tests/integration/targets/gandi_livedns/tasks/update_record.yml +++ b/tests/integration/targets/gandi_livedns/tasks/update_record.yml @@ -11,7 +11,7 @@ values: "{{ item.update_values | default(item['values']) }}" ttl: "{{ item.update_ttl | default(item.ttl) }}" type: "{{ item.type }}" - check_mode: yes + check_mode: true register: result - name: verify test update in check mode assert: diff --git a/tests/integration/targets/gem/tasks/main.yml b/tests/integration/targets/gem/tasks/main.yml index edf813ba4a..7b975f0351 100644 --- a/tests/integration/targets/gem/tasks/main.yml +++ b/tests/integration/targets/gem/tasks/main.yml @@ -34,7 +34,7 @@ name: gist state: present register: install_gem_result - ignore_errors: yes + ignore_errors: true # when running as root on Fedora, '--install-dir' is set in the os defaults which is # incompatible with '--user-install', we ignore this error for this case only @@ -79,7 +79,7 @@ gem: name: gist state: present - user_install: no + user_install: false register: install_gem_result - name: List gems @@ -115,7 +115,7 @@ name: gist state: present install_dir: "{{ remote_tmp_dir }}/gems" - ignore_errors: yes + ignore_errors: true register: install_gem_fail_result - debug: @@ -132,7 +132,7 @@ gem: name: gist state: present - user_install: no + user_install: false install_dir: "{{ remote_tmp_dir }}/gems" register: install_gem_result @@ -148,13 +148,13 @@ that: - install_gem_result is changed - gem_search.files[0].path is search('gist-[0-9.]+') - ignore_errors: yes + ignore_errors: true - name: Remove a gem in a custom directory gem: name: gist state: absent - user_install: no + user_install: false install_dir: "{{ remote_tmp_dir }}/gems" register: install_gem_result @@ -177,7 +177,7 @@ name: gist state: present bindir: "{{ remote_tmp_dir }}/custom_bindir" - norc: yes + norc: true user_install: no # Avoid conflicts between --install-dir and --user-install when running as root on CentOS / Fedora / RHEL register: install_gem_result @@ -197,7 +197,7 @@ name: gist state: absent bindir: "{{ remote_tmp_dir }}/custom_bindir" - norc: yes + norc: true user_install: no # Avoid conflicts between --install-dir and --user-install when running as root on CentOS / Fedora / RHEL register: install_gem_result diff --git a/tests/integration/targets/git_config/tasks/exclusion_state_list-all.yml b/tests/integration/targets/git_config/tasks/exclusion_state_list-all.yml index d908f6e737..e294a83fb5 100644 --- a/tests/integration/targets/git_config/tasks/exclusion_state_list-all.yml +++ b/tests/integration/targets/git_config/tasks/exclusion_state_list-all.yml @@ -10,7 +10,7 @@ list_all: true state: absent register: result - ignore_errors: yes + ignore_errors: true - name: assert git_config failed assert: diff --git a/tests/integration/targets/git_config/tasks/setup.yml b/tests/integration/targets/git_config/tasks/setup.yml index 0112011bd6..6e5516da57 100644 --- a/tests/integration/targets/git_config/tasks/setup.yml +++ b/tests/integration/targets/git_config/tasks/setup.yml @@ -6,10 +6,10 @@ - name: verify that git is installed so this test can continue command: which git register: git_installed - ignore_errors: yes + ignore_errors: true - name: get git version, only newer than {{git_version_supporting_includes}} has includes option shell: "git --version | grep 'git version' | sed 's/git version //'" register: git_version - ignore_errors: yes + ignore_errors: true ... diff --git a/tests/integration/targets/git_config/tasks/unset_check_mode.yml b/tests/integration/targets/git_config/tasks/unset_check_mode.yml index 52ab4a27f3..39bce33790 100644 --- a/tests/integration/targets/git_config/tasks/unset_check_mode.yml +++ b/tests/integration/targets/git_config/tasks/unset_check_mode.yml @@ -10,7 +10,7 @@ name: "{{ option_name }}" scope: "{{ option_scope }}" state: absent - check_mode: yes + check_mode: true register: unset_result - name: getting value diff --git a/tests/integration/targets/gitlab_group_variable/tasks/main.yml b/tests/integration/targets/gitlab_group_variable/tasks/main.yml index 0f4a93f461..3ba0a176cd 100644 --- a/tests/integration/targets/gitlab_group_variable/tasks/main.yml +++ b/tests/integration/targets/gitlab_group_variable/tasks/main.yml @@ -27,7 +27,7 @@ group: "{{ gitlab_group_name }}" vars: ACCESS_KEY_ID: checkmode - check_mode: yes + check_mode: true register: gitlab_group_variable_state - name: check_mode state must be changed @@ -202,7 +202,7 @@ group: "{{ gitlab_group_name }}" vars: ACCESS_KEY_ID: checkmode - check_mode: yes + check_mode: true register: gitlab_group_variable_state - name: check_mode state must not be changed @@ -665,7 +665,7 @@ variables: - name: delete_me register: gitlab_group_variable_state - ignore_errors: yes + ignore_errors: true - name: verify fail assert: diff --git a/tests/integration/targets/gitlab_project_badge/tasks/main.yml b/tests/integration/targets/gitlab_project_badge/tasks/main.yml index fa8a806efe..dfd0bee75b 100644 --- a/tests/integration/targets/gitlab_project_badge/tasks/main.yml +++ b/tests/integration/targets/gitlab_project_badge/tasks/main.yml @@ -23,7 +23,7 @@ state: present - name: Create Badge (check) - check_mode: yes + check_mode: true gitlab_project_badge: api_url: "{{ gitlab_api_url }}" validate_certs: False @@ -84,7 +84,7 @@ - not gitlab_badge_create_confirmation_task.failed - name: Update Badge (check) - check_mode: yes + check_mode: true gitlab_project_badge: api_url: "{{ gitlab_api_url }}" validate_certs: False @@ -145,7 +145,7 @@ - not gitlab_badge_update_confirmation_task.failed - name: Delete Badge (check) - check_mode: yes + check_mode: true gitlab_project_badge: api_url: "{{ gitlab_api_url }}" validate_certs: False diff --git a/tests/integration/targets/gitlab_project_variable/tasks/main.yml b/tests/integration/targets/gitlab_project_variable/tasks/main.yml index 3c90bfe467..c82671aeae 100644 --- a/tests/integration/targets/gitlab_project_variable/tasks/main.yml +++ b/tests/integration/targets/gitlab_project_variable/tasks/main.yml @@ -27,7 +27,7 @@ project: "{{ gitlab_project_name }}" vars: ACCESS_KEY_ID: checkmode - check_mode: yes + check_mode: true register: gitlab_project_variable_state - name: check_mode state must be changed @@ -202,7 +202,7 @@ project: "{{ gitlab_project_name }}" vars: ACCESS_KEY_ID: checkmode - check_mode: yes + check_mode: true register: gitlab_project_variable_state - name: check_mode state must not be changed @@ -660,7 +660,7 @@ variables: - name: delete_me register: gitlab_project_variable_state - ignore_errors: yes + ignore_errors: true - name: verify fail assert: diff --git a/tests/integration/targets/hg/tasks/main.yml b/tests/integration/targets/hg/tasks/main.yml index a2cb8df903..1ca30459c8 100644 --- a/tests/integration/targets/hg/tasks/main.yml +++ b/tests/integration/targets/hg/tasks/main.yml @@ -12,7 +12,7 @@ - name: determine if mercurial is already installed command: which hg register: has_hg - ignore_errors: yes + ignore_errors: true - name: warn if the underlying system is not capable of running these tests debug: diff --git a/tests/integration/targets/hg/tasks/run-tests.yml b/tests/integration/targets/hg/tasks/run-tests.yml index e38aeae104..928b7cb68d 100644 --- a/tests/integration/targets/hg/tasks/run-tests.yml +++ b/tests/integration/targets/hg/tasks/run-tests.yml @@ -72,8 +72,8 @@ - name: Checkout non-existent repo clone hg: repo: "http://hg.pf.osdn.net/view/a/ak/akasurde/hg_project_test_1" - clone: no - update: no + clone: false + update: false register: hg_result3 ignore_errors: true diff --git a/tests/integration/targets/hg/tasks/uninstall.yml b/tests/integration/targets/hg/tasks/uninstall.yml index 80a28f0623..4a26995ef4 100644 --- a/tests/integration/targets/hg/tasks/uninstall.yml +++ b/tests/integration/targets/hg/tasks/uninstall.yml @@ -25,7 +25,7 @@ dnf: name: mercurial state: absent - autoremove: yes + autoremove: true when: ansible_facts.pkg_mgr == 'dnf' # the yum module does not have an autoremove parameter @@ -37,7 +37,7 @@ package: name: mercurial state: absent - autoremove: yes + autoremove: true when: ansible_facts.pkg_mgr in ['pkgng', 'community.general.pkgng'] - name: uninstall packages which were not originally installed (zypper) diff --git a/tests/integration/targets/homebrew/tasks/main.yml b/tests/integration/targets/homebrew/tasks/main.yml index 07cc81d034..1db3ef1a6a 100644 --- a/tests/integration/targets/homebrew/tasks/main.yml +++ b/tests/integration/targets/homebrew/tasks/main.yml @@ -22,9 +22,9 @@ #- name: Use ignored-pinned option while upgrading all # homebrew: -# upgrade_all: yes +# upgrade_all: true # upgrade_options: ignore-pinned -# become: yes +# become: true # become_user: "{{ brew_stat.stat.pw_name }}" # register: upgrade_option_result # environment: @@ -42,16 +42,16 @@ homebrew: name: "{{ package_name }}" state: absent - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" - name: Install {{ package_name }} package using homebrew homebrew: name: "{{ package_name }}" state: present - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: package_result @@ -63,8 +63,8 @@ homebrew: name: "{{ package_name }}" state: present - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: package_result @@ -76,8 +76,8 @@ homebrew: name: "{{ package_name }}" state: absent - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: package_result @@ -89,8 +89,8 @@ homebrew: name: "{{ package_name }}" state: absent - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: package_result diff --git a/tests/integration/targets/homebrew_cask/tasks/main.yml b/tests/integration/targets/homebrew_cask/tasks/main.yml index 9d7ac47b5a..85f2572664 100644 --- a/tests/integration/targets/homebrew_cask/tasks/main.yml +++ b/tests/integration/targets/homebrew_cask/tasks/main.yml @@ -25,7 +25,7 @@ homebrew_cask: name: "{{ cask }}" state: present - become: yes + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: cask_install_result @@ -38,7 +38,7 @@ homebrew_cask: name: "{{ cask }}" state: present - become: yes + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: cask_install_result @@ -53,7 +53,7 @@ name: "{{ cask }}" state: present install_options: force - become: yes + become: true become_user: "{{ brew_stat.stat.pw_name }}" register: cask_install_result @@ -68,6 +68,6 @@ name: "{{ cask }}" state: absent install_options: force - become: yes + become: true become_user: "{{ brew_stat.stat.pw_name }}" - ignore_errors: yes + ignore_errors: true diff --git a/tests/integration/targets/homectl/tasks/main.yml b/tests/integration/targets/homectl/tasks/main.yml index c57052c5d8..93c1089b47 100644 --- a/tests/integration/targets/homectl/tasks/main.yml +++ b/tests/integration/targets/homectl/tasks/main.yml @@ -7,19 +7,19 @@ - name: check systemd version command: "systemctl --version" register: systemd_version - ignore_errors: yes + ignore_errors: true - name: check homectl version command: homectl --version register: homectl_version - ignore_errors: yes + ignore_errors: true - block: - name: Check and start systemd-homed service service: name: systemd-homed.service state: started - enabled: yes + enabled: true - name: Add a user 'james' community.general.homectl: @@ -55,9 +55,9 @@ name: foo password: uq4895738!@#$%dfd state: present - resize: yes + resize: true register: resize_out - ignore_errors: yes + ignore_errors: true - name: Use option 'disksize=1G' without option resize (allowed) community.general.homectl: @@ -66,13 +66,13 @@ state: present disksize: 1G register: disk_out - ignore_errors: yes + ignore_errors: true - name: Try to Create user without giving password community.general.homectl: name: danielle register: danielle_out - ignore_errors: yes + ignore_errors: true - name: remove user 'foobar' without requiring password community.general.homectl: @@ -102,20 +102,20 @@ name: janet state: absent register: user_not_exist - ignore_errors: yes + ignore_errors: true - name: Use check_mode to try and create user 'diana' community.general.homectl: name: diana password: helloworld123!@ state: present - check_mode: yes + check_mode: true register: diana_create_checkmode_out - name: Verify user 'diana' was not created with check_mode command: homectl inspect diana register: user_diana_exists - ignore_errors: yes + ignore_errors: true - name: Try to modify user 'jake' with only noexec mount option in check_mode community.general.homectl: @@ -123,7 +123,7 @@ password: myreallysecurepassword12! state: present mountopts: noexec - check_mode: yes + check_mode: true register: jake_checkmode_out - name: Verify user 'jake' was not modified and still has all mount options @@ -152,8 +152,8 @@ password: incorrectPassword! state: present mountopts: noexec - locked: yes - ignore_errors: yes + locked: true + ignore_errors: true register: jake_incorrect_pass_out - assert: diff --git a/tests/integration/targets/hwc_ecs_instance/tasks/main.yml b/tests/integration/targets/hwc_ecs_instance/tasks/main.yml index 9322558f96..dd70861522 100644 --- a/tests/integration/targets/hwc_ecs_instance/tasks/main.yml +++ b/tests/integration/targets/hwc_ecs_instance/tasks/main.yml @@ -84,7 +84,7 @@ root_volume: volume_type: "SAS" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -139,7 +139,7 @@ root_volume: volume_type: "SAS" state: present - check_mode: yes + check_mode: true register: result - name: idemponent assert: @@ -195,7 +195,7 @@ root_volume: volume_type: "SAS" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: diff --git a/tests/integration/targets/hwc_evs_disk/tasks/main.yml b/tests/integration/targets/hwc_evs_disk/tasks/main.yml index e691169016..63b7d03f95 100644 --- a/tests/integration/targets/hwc_evs_disk/tasks/main.yml +++ b/tests/integration/targets/hwc_evs_disk/tasks/main.yml @@ -64,7 +64,7 @@ volume_type: "SATA" size: 10 state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -91,7 +91,7 @@ volume_type: "SATA" size: 10 state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is false assert: diff --git a/tests/integration/targets/hwc_vpc_eip/tasks/main.yml b/tests/integration/targets/hwc_vpc_eip/tasks/main.yml index 462b5ff93f..bbcefcaa62 100644 --- a/tests/integration/targets/hwc_vpc_eip/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_eip/tasks/main.yml @@ -49,7 +49,7 @@ size: 1 port_id: "{{ port.id }}" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -80,7 +80,7 @@ size: 1 port_id: "{{ port.id }}" state: present - check_mode: yes + check_mode: true register: result - name: idemponent assert: @@ -112,7 +112,7 @@ size: 1 port_id: "{{ port.id }}" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -143,7 +143,7 @@ size: 1 port_id: "{{ port.id }}" state: absent - check_mode: yes + check_mode: true register: result - name: idemponent assert: diff --git a/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml b/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml index 6a5eb19b89..b8e02a5394 100644 --- a/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml @@ -36,7 +36,7 @@ peering_vpc: vpc_id: "{{ vpc2.id }}" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -64,7 +64,7 @@ peering_vpc: vpc_id: "{{ vpc2.id }}" state: present - check_mode: yes + check_mode: true register: result - name: idemponent assert: @@ -92,7 +92,7 @@ peering_vpc: vpc_id: "{{ vpc2.id }}" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -119,7 +119,7 @@ peering_vpc: vpc_id: "{{ vpc2.id }}" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is false assert: diff --git a/tests/integration/targets/hwc_vpc_port/tasks/main.yml b/tests/integration/targets/hwc_vpc_port/tasks/main.yml index d78498cbb6..bb8cf81b0b 100644 --- a/tests/integration/targets/hwc_vpc_port/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_port/tasks/main.yml @@ -35,7 +35,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -81,7 +81,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -104,7 +104,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: absent - check_mode: yes + check_mode: true register: result - name: idemponent assert: diff --git a/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml b/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml index 8bfd3e4d82..25972d7e9f 100644 --- a/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml @@ -35,7 +35,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -58,7 +58,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: present - check_mode: yes + check_mode: true register: result - name: idemponent assert: @@ -82,7 +82,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -105,7 +105,7 @@ subnet_id: "{{ subnet.id }}" ip_address: "192.168.100.33" state: absent - check_mode: yes + check_mode: true register: result - name: idemponent assert: diff --git a/tests/integration/targets/hwc_vpc_route/tasks/main.yml b/tests/integration/targets/hwc_vpc_route/tasks/main.yml index c7ae7989ca..8e2e2ca825 100644 --- a/tests/integration/targets/hwc_vpc_route/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_route/tasks/main.yml @@ -43,7 +43,7 @@ vpc_id: "{{ vpc1.id }}" destination: "192.168.0.0/16" next_hop: "{{ connect.id }}" - check_mode: yes + check_mode: true register: result - assert: that: @@ -68,7 +68,7 @@ destination: "192.168.0.0/16" next_hop: "{{ connect.id }}" state: present - check_mode: yes + check_mode: true register: result - name: idemponent assert: @@ -94,7 +94,7 @@ destination: "192.168.0.0/16" next_hop: "{{ connect.id }}" state: absent - check_mode: yes + check_mode: true #---------------------------------------------------------- - name: delete a route hwc_vpc_route: @@ -114,7 +114,7 @@ destination: "192.168.0.0/16" next_hop: "{{ connect.id }}" state: absent - check_mode: yes + check_mode: true register: result - name: not changed assert: diff --git a/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml b/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml index f9d8e5bf76..b6ee25e25b 100644 --- a/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml @@ -18,7 +18,7 @@ hwc_vpc_security_group: name: "ansible_network_security_group_test" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -40,7 +40,7 @@ hwc_vpc_security_group: name: "ansible_network_security_group_test" state: present - check_mode: yes + check_mode: true register: idemponent - name: idemponent assert: @@ -62,7 +62,7 @@ hwc_vpc_security_group: name: "ansible_network_security_group_test" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: diff --git a/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml b/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml index 0b7f99fd61..4ce4bafdc4 100644 --- a/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml @@ -35,7 +35,7 @@ port_range_min: 22 remote_ip_prefix: "0.0.0.0/0" state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -102,7 +102,7 @@ port_range_min: 22 remote_ip_prefix: "0.0.0.0/0" state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: diff --git a/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml b/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml index 90243203f6..2eb7980b34 100644 --- a/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml @@ -32,7 +32,7 @@ name: "ansible_network_subnet_test" dhcp_enable: True state: present - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -62,7 +62,7 @@ name: "ansible_network_subnet_test" dhcp_enable: True state: present - check_mode: yes + check_mode: true register: result - name: idemponent assert: @@ -92,7 +92,7 @@ name: "ansible_network_subnet_test" dhcp_enable: True state: absent - check_mode: yes + check_mode: true register: result - name: assert changed is true assert: @@ -121,7 +121,7 @@ name: "ansible_network_subnet_test" dhcp_enable: True state: absent - check_mode: yes + check_mode: true register: result - name: idemponent assert: diff --git a/tests/integration/targets/ini_file/tasks/tests/01-value.yml b/tests/integration/targets/ini_file/tasks/tests/01-value.yml index 9670cd20f9..f95f166fe5 100644 --- a/tests/integration/targets/ini_file/tasks/tests/01-value.yml +++ b/tests/integration/targets/ini_file/tasks/tests/01-value.yml @@ -174,7 +174,7 @@ path: "{{ output_file }}" section: mysqld option: skip-name - allow_no_value: yes + allow_no_value: true register: result8 - name: test-value 8 - read content from output file @@ -203,7 +203,7 @@ path: "{{ output_file }}" section: mysqld option: skip-name - allow_no_value: yes + allow_no_value: true register: result9 - name: test-value 9 - assert 'changed' is false @@ -217,7 +217,7 @@ ini_file: path: "{{ output_file }}" section: new_empty_section - allow_no_value: yes + allow_no_value: true register: result10 - name: test-value 10 - assert 'changed' is true and section added @@ -231,7 +231,7 @@ ini_file: path: "{{ output_file }}" section: new_empty_section - allow_no_value: yes + allow_no_value: true register: result11 - name: test-value 11 - assert 'changed' is false @@ -246,7 +246,7 @@ state: absent path: "{{ output_file }}" section: new_empty_section - allow_no_value: yes + allow_no_value: true - name: test-value 12 - test allow_no_value with loop ini_file: @@ -254,7 +254,7 @@ section: mysqld option: "{{ item.o }}" value: "{{ item.v | d(omit) }}" - allow_no_value: yes + allow_no_value: true loop: - { o: "skip-name-resolve" } - { o: "max_connections", v: "500" } @@ -316,7 +316,7 @@ path: "{{ output_file }}" section: mysqld option: skip-name - allow_no_value: yes + allow_no_value: true register: result14 - name: test-value 14 - read content from output file @@ -376,7 +376,7 @@ copy: content: "" dest: "{{ output_file }}" - force: yes + force: true - name: test-value 16 - Ensure "beverage=coke" is created within no section ini_file: diff --git a/tests/integration/targets/ini_file/tasks/tests/02-values.yml b/tests/integration/targets/ini_file/tasks/tests/02-values.yml index 23071ebccc..b19a8799c1 100644 --- a/tests/integration/targets/ini_file/tasks/tests/02-values.yml +++ b/tests/integration/targets/ini_file/tasks/tests/02-values.yml @@ -722,7 +722,7 @@ copy: content: "" dest: "{{ output_file }}" - force: yes + force: true - name: "test-values 25 - Ensure 'beverage=[coke, pepsi]' is created within no section" ini_file: diff --git a/tests/integration/targets/iptables_state/tasks/main.yml b/tests/integration/targets/iptables_state/tasks/main.yml index 8ed0b46d0e..a74e74df48 100644 --- a/tests/integration/targets/iptables_state/tasks/main.yml +++ b/tests/integration/targets/iptables_state/tasks/main.yml @@ -12,7 +12,7 @@ package: name: - iptables - become: yes + become: true - name: include tasks @@ -35,4 +35,4 @@ - xtables_lock is undefined - ansible_connection in ['ssh', 'paramiko', 'smart'] - become: yes + become: true diff --git a/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml b/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml index 722f362da9..7b366edcec 100644 --- a/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml +++ b/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml @@ -22,14 +22,14 @@ iptables_state: name: foobar register: iptables_state - ignore_errors: yes + ignore_errors: true - name: "assert that results are as expected" assert: that: - iptables_state is failed - iptables_state.msg is match("Invalid options") - quiet: yes + quiet: true @@ -37,14 +37,14 @@ iptables_state: path: foobar register: iptables_state - ignore_errors: yes + ignore_errors: true - name: "assert that results are as expected" assert: that: - iptables_state is failed - iptables_state.msg is match("missing required arguments") - quiet: yes + quiet: true @@ -52,14 +52,14 @@ iptables_state: state: saved register: iptables_state - ignore_errors: yes + ignore_errors: true - name: "assert that results are as expected" assert: that: - iptables_state is failed - iptables_state.msg is match("missing required arguments") - quiet: yes + quiet: true @@ -68,14 +68,14 @@ path: foobar state: present register: iptables_state - ignore_errors: yes + ignore_errors: true - name: "assert that results are as expected" assert: that: - iptables_state is failed - iptables_state.msg is match("value of state must be one of") - quiet: yes + quiet: true # @@ -89,14 +89,14 @@ path: "{{ iptables_saved }}" state: saved register: iptables_state - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: that: - iptables_state is changed - iptables_state.initial_state == iptables_state.saved - quiet: yes + quiet: true @@ -111,7 +111,7 @@ that: - iptables_state is changed - iptables_state.initial_state == iptables_state.saved - quiet: yes + quiet: true @@ -126,7 +126,7 @@ that: - iptables_state is not changed - iptables_state.initial_state == iptables_state.saved - quiet: yes + quiet: true @@ -135,14 +135,14 @@ path: "{{ iptables_saved }}" state: saved register: iptables_state - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: that: - iptables_state is not changed - iptables_state.initial_state == iptables_state.saved - quiet: yes + quiet: true @@ -157,14 +157,14 @@ path: "{{ iptables_saved }}" state: restored register: iptables_state - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: that: - iptables_state is not changed - iptables_state.initial_state == iptables_state.restored - quiet: yes + quiet: true rescue: - name: "assert that results are not as expected for only one reason (xtables lock)" @@ -172,7 +172,7 @@ that: - iptables_state is failed - iptables_state.stderr is search('xtables lock') - quiet: yes + quiet: true register: xtables_lock @@ -190,7 +190,7 @@ that: - iptables_state is not changed - iptables_state.initial_state == iptables_state.restored - quiet: yes + quiet: true rescue: - name: "assert that results are not as expected for only one reason (xtables lock)" @@ -198,7 +198,7 @@ that: - iptables_state is failed - iptables_state.stderr is search('xtables lock') - quiet: yes + quiet: true register: xtables_lock @@ -217,14 +217,14 @@ path: "{{ iptables_saved }}" state: restored register: iptables_state - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: that: - iptables_state is changed - iptables_state.initial_state != iptables_state.restored - quiet: yes + quiet: true rescue: - name: "assert that results are not as expected for only one reason (xtables lock)" @@ -232,7 +232,7 @@ that: - iptables_state is failed - iptables_state.stderr is search('xtables lock') - quiet: yes + quiet: true register: xtables_lock @@ -253,7 +253,7 @@ - iptables_state is changed - iptables_state.initial_state != iptables_state.restored - iptables_state.applied - quiet: yes + quiet: true rescue: - name: "assert that results are not as expected for only one reason (xtables lock)" @@ -261,7 +261,7 @@ that: - iptables_state is failed - iptables_state.stderr is search('xtables lock') - quiet: yes + quiet: true register: xtables_lock @@ -281,7 +281,7 @@ that: - iptables_state is not changed - iptables_state.initial_state == iptables_state.restored - quiet: yes + quiet: true rescue: - name: "assert that results are not as expected for only one reason (xtables lock)" @@ -289,7 +289,7 @@ that: - iptables_state is failed - iptables_state.stderr is search('xtables lock') - quiet: yes + quiet: true register: xtables_lock @@ -301,14 +301,14 @@ path: "{{ iptables_saved }}" state: restored register: iptables_state - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: that: - iptables_state is not changed - iptables_state.initial_state == iptables_state.restored - quiet: yes + quiet: true rescue: - name: "assert that results are not as expected for only one reason (xtables lock)" @@ -316,5 +316,5 @@ that: - iptables_state is failed - iptables_state.stderr is search('xtables lock') - quiet: yes + quiet: true register: xtables_lock diff --git a/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml b/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml index 929928c8e7..8a9869c437 100644 --- a/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml +++ b/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml @@ -17,7 +17,7 @@ path: "{{ iptables_saved }}" register: iptables_state changed_when: false - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: @@ -25,7 +25,7 @@ - "'*filter' in iptables_state.initial_state" - iptables_state.tables.filter is defined - iptables_state.tables.nat is undefined - quiet: yes + quiet: true @@ -36,7 +36,7 @@ path: "{{ iptables_saved }}" register: iptables_state changed_when: false - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: @@ -45,7 +45,7 @@ - "'*filter' in iptables_state.initial_state" - iptables_state.tables.nat is defined - iptables_state.tables.filter is undefined - quiet: yes + quiet: true @@ -65,7 +65,7 @@ - "'*nat' not in iptables_state.saved" - iptables_state.tables.filter is defined - iptables_state.tables.nat is undefined - quiet: yes + quiet: true @@ -86,7 +86,7 @@ - "'*filter' not in iptables_state.saved" - iptables_state.tables.nat is defined - iptables_state.tables.filter is undefined - quiet: yes + quiet: true @@ -106,7 +106,7 @@ - "'*nat' in iptables_state.saved" - iptables_state.tables.filter is defined - iptables_state.tables.nat is defined - quiet: yes + quiet: true @@ -129,7 +129,7 @@ - iptables_state.tables.nat is defined - iptables_state.tables.filter is undefined - iptables_state is not changed - quiet: yes + quiet: true @@ -163,7 +163,7 @@ - "'-A INPUT -j ACCEPT' not in iptables_state.restored" - iptables_state.tables.filter is undefined - iptables_state is changed - quiet: yes + quiet: true @@ -176,7 +176,7 @@ - raw - mangle changed_when: false - check_mode: yes + check_mode: true @@ -197,7 +197,7 @@ - "'*nat' in iptables_state.saved" - "'raw' in iptables_state.tables" - "'*raw' in iptables_state.saved" - quiet: yes + quiet: true @@ -239,7 +239,7 @@ - "'*nat' not in iptables_state.restored" - "'*raw' not in iptables_state.restored" - iptables_state is not changed - quiet: yes + quiet: true @@ -267,7 +267,7 @@ - "'*nat' in iptables_state.restored" - "'*raw' in iptables_state.restored" - iptables_state is not changed - quiet: yes + quiet: true @@ -279,7 +279,7 @@ register: iptables_state async: "{{ ansible_timeout }}" poll: 0 - ignore_errors: yes + ignore_errors: true - name: "explain expected failure" assert: diff --git a/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml b/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml index af49482114..53fdd3ca03 100644 --- a/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml +++ b/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml @@ -18,7 +18,7 @@ path: "{{ iptables_tests }}" state: restored register: iptables_state - check_mode: yes + check_mode: true - name: "assert that results are as expected" assert: diff --git a/tests/integration/targets/ipwcli_dns/tasks/main.yml b/tests/integration/targets/ipwcli_dns/tasks/main.yml index ca47b4dece..9cbb4edc2e 100644 --- a/tests/integration/targets/ipwcli_dns/tasks/main.yml +++ b/tests/integration/targets/ipwcli_dns/tasks/main.yml @@ -83,7 +83,7 @@ username: '{{ username }}' password: '{{ password }}' register: result - ignore_errors: yes + ignore_errors: true - name: assert the failure of the new SRV record assert: @@ -105,7 +105,7 @@ flags: S username: '{{ username }}' password: '{{ password }}' - check_mode: yes + check_mode: true register: result - name: assert the NAPTR check_mode diff --git a/tests/integration/targets/iso_create/tasks/main.yml b/tests/integration/targets/iso_create/tasks/main.yml index 4d321c2d23..a719e91d8e 100644 --- a/tests/integration/targets/iso_create/tasks/main.yml +++ b/tests/integration/targets/iso_create/tasks/main.yml @@ -35,7 +35,7 @@ dest_iso: "{{ output_test_dir }}/test.iso" interchange_level: 3 register: iso_result - check_mode: yes + check_mode: true - debug: var=iso_result - name: Check if iso file created diff --git a/tests/integration/targets/iso_extract/tasks/7zip.yml b/tests/integration/targets/iso_extract/tasks/7zip.yml index 3d3c12250a..b16f202398 100644 --- a/tests/integration/targets/iso_extract/tasks/7zip.yml +++ b/tests/integration/targets/iso_extract/tasks/7zip.yml @@ -7,7 +7,7 @@ - name: Gather facts setup: - become: yes + become: true - name: Include distribution specific variables include_vars: "{{ lookup('first_found', params) }}" @@ -45,8 +45,8 @@ homebrew: name: p7zip state: present - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" # Newer versions of brew want to compile a package which takes a long time. Do not upgrade homebrew until a # proper solution can be found diff --git a/tests/integration/targets/iso_extract/tasks/main.yml b/tests/integration/targets/iso_extract/tasks/main.yml index 4a7097de8a..67ebfa7ab6 100644 --- a/tests/integration/targets/iso_extract/tasks/main.yml +++ b/tests/integration/targets/iso_extract/tasks/main.yml @@ -29,7 +29,7 @@ - name: Test in normal mode import_tasks: tests.yml vars: - in_check_mode: no + in_check_mode: false - name: Prepare environment import_tasks: prepare.yml @@ -37,7 +37,7 @@ - name: Test in check-mode import_tasks: tests.yml vars: - in_check_mode: yes - check_mode: yes + in_check_mode: true + check_mode: true # FIXME - fill this in after figuring out how to allow mounts diff --git a/tests/integration/targets/java_cert/tasks/main.yml b/tests/integration/targets/java_cert/tasks/main.yml index 54d205c255..25ec87e8f9 100644 --- a/tests/integration/targets/java_cert/tasks/main.yml +++ b/tests/integration/targets/java_cert/tasks/main.yml @@ -24,7 +24,7 @@ cert_alias: default keystore_path: "{{ remote_tmp_dir }}/{{ test_keystore_path }}" keystore_pass: changeme_keystore - keystore_create: yes + keystore_create: true state: present register: result_success @@ -41,7 +41,7 @@ cert_alias: default_new keystore_path: "{{ remote_tmp_dir }}/{{ test_keystore_path }}" keystore_pass: changeme_keystore - keystore_create: yes + keystore_create: true state: present ignore_errors: true register: result_wrong_pass @@ -58,7 +58,7 @@ cert_alias: default keystore_path: "{{ remote_tmp_dir }}/{{ test_keystore_path }}" keystore_pass: changeme_keystore - keystore_create: yes + keystore_create: true state: present ignore_errors: true register: result_excl_params diff --git a/tests/integration/targets/java_cert/tasks/state_change.yml b/tests/integration/targets/java_cert/tasks/state_change.yml index 114c51ef58..e135a60a3e 100644 --- a/tests/integration/targets/java_cert/tasks/state_change.yml +++ b/tests/integration/targets/java_cert/tasks/state_change.yml @@ -117,7 +117,7 @@ pkcs12_password: "{{ test_keystore2_password }}" keystore_path: "{{ test_keystore2_path }}" keystore_pass: "{{ test_keystore2_password }}" - keystore_create: yes + keystore_create: true - name: List newly created keystore content ansible.builtin.command: @@ -138,8 +138,8 @@ pkcs12_password: "{{ test_keystore2_password }}" keystore_path: "{{ test_keystore2_path }}" keystore_pass: "{{ test_keystore2_password }}" - keystore_create: yes - ignore_errors: yes + keystore_create: true + ignore_errors: true register: result_x509_changed - name: Verify the x509 status is failed @@ -153,7 +153,7 @@ cert_path: "{{ test_cert_path }}" keystore_path: "{{ test_keystore2_path }}" keystore_pass: "{{ test_keystore2_password }}" - keystore_create: yes + keystore_create: true state: present register: result_x509_changed diff --git a/tests/integration/targets/java_keystore/tasks/tests.yml b/tests/integration/targets/java_keystore/tasks/tests.yml index a3d6ebf7d9..899fe27e85 100644 --- a/tests/integration/targets/java_keystore/tasks/tests.yml +++ b/tests/integration/targets/java_keystore/tasks/tests.yml @@ -46,7 +46,7 @@ loop: "{{ java_keystore_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_check - name: Create a Java keystore for the given certificates @@ -62,7 +62,7 @@ loop: "{{ java_keystore_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_idem_check - name: Create a Java keystore for the given certificates (idempotency) @@ -102,7 +102,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_change_check - name: Create a Java keystore for the given certificates (certificate changed) @@ -120,7 +120,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_alias_change_check - name: Create a Java keystore for the given certificates (alias changed) @@ -141,7 +141,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_pw_change_check - name: Create a Java keystore for the given certificates (password changed) @@ -164,7 +164,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_type_pkcs12_check - name: Create a Java keystore for the given certificates (force keystore type jks, check mode) @@ -176,7 +176,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_type_jks_check - name: Create a Java keystore for the given certificates (force keystore type jks) @@ -225,7 +225,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_type_change_check - name: Create a Java keystore for the given certificates (keystore type changed) @@ -248,7 +248,7 @@ loop: "{{ java_keystore_new_certs }}" loop_control: index_var: loop_index - check_mode: yes + check_mode: true register: result_type_omit_check - name: Create a Java keystore for the given certificates (omit keystore type) diff --git a/tests/integration/targets/jboss/tasks/jboss.yml b/tests/integration/targets/jboss/tasks/jboss.yml index 13d0c6bc70..2403a02c4f 100644 --- a/tests/integration/targets/jboss/tasks/jboss.yml +++ b/tests/integration/targets/jboss/tasks/jboss.yml @@ -48,7 +48,7 @@ test_deployment: helloworld-1.war task_parameters: &task_parameters become_user: '{{ wf_user }}' - become: yes + become: true register: result block: @@ -67,7 +67,7 @@ jboss: deployment: '{{ war_file_1 }}' src: '{{ war_file_1_path }}' - check_mode: yes + check_mode: true - assert: that: @@ -78,7 +78,7 @@ <<: *task_parameters file: path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed' - ignore_errors: yes + ignore_errors: true - assert: that: @@ -113,7 +113,7 @@ deployment: '{{ war_file_1 }}' src: '{{ war_file_1_path }}' deploy_path: '{{ deploy_dir }}' - check_mode: yes + check_mode: true - assert: that: @@ -148,7 +148,7 @@ deployment: '{{ war_file_1 }}' deploy_path: '{{ deploy_dir }}' state: absent - check_mode: yes + check_mode: true - assert: that: @@ -191,7 +191,7 @@ deployment: '{{ war_file_1 }}' deploy_path: '{{ deploy_dir }}' state: absent - check_mode: yes + check_mode: true - assert: that: @@ -217,7 +217,7 @@ deploy_path: '{{ deploy_dir }}' src: '{{ fake_src_path }}' state: present - ignore_errors: yes + ignore_errors: true - assert: that: @@ -230,7 +230,7 @@ jboss: deployment: '{{ war_file_1 }}' state: present - ignore_errors: yes + ignore_errors: true - assert: that: diff --git a/tests/integration/targets/keycloak_client/tasks/main.yml b/tests/integration/targets/keycloak_client/tasks/main.yml index 933f00bd15..513d5836b8 100644 --- a/tests/integration/targets/keycloak_client/tasks/main.yml +++ b/tests/integration/targets/keycloak_client/tasks/main.yml @@ -45,7 +45,7 @@ - name: Check client again with same props community.general.keycloak_client: "{{ auth_args | combine(call_args) }}" - check_mode: yes + check_mode: true vars: call_args: realm: "{{ realm }}" diff --git a/tests/integration/targets/launchd/tasks/setup.yml b/tests/integration/targets/launchd/tasks/setup.yml index 1df9667bf9..bd7134cc07 100644 --- a/tests/integration/targets/launchd/tasks/setup.yml +++ b/tests/integration/targets/launchd/tasks/setup.yml @@ -7,7 +7,7 @@ template: src: "{{ launchd_service_name }}.plist.j2" dest: "{{ launchd_plist_location }}" - become: yes + become: true - name: install the test daemon script copy: @@ -20,4 +20,4 @@ path: /usr/local/sbin/ansible_test_service line: "#!{{ ansible_python_interpreter | realpath }}" insertbefore: BOF - firstmatch: yes + firstmatch: true diff --git a/tests/integration/targets/launchd/tasks/teardown.yml b/tests/integration/targets/launchd/tasks/teardown.yml index e781757050..e364056e6d 100644 --- a/tests/integration/targets/launchd/tasks/teardown.yml +++ b/tests/integration/targets/launchd/tasks/teardown.yml @@ -7,7 +7,7 @@ launchd: name: "{{ launchd_service_name }}" state: unloaded - become: yes + become: true register: launchd_unloaded_result - name: "[{{ item }}] Validation" @@ -21,10 +21,10 @@ file: path: "{{ launchd_plist_location }}" state: absent - become: yes + become: true - name: "[{{ item }}] Remove test service server" file: path: "/usr/local/sbin/ansible_test_service" state: absent - become: yes + become: true diff --git a/tests/integration/targets/launchd/tasks/tests/test_reload.yml b/tests/integration/targets/launchd/tasks/tests/test_reload.yml index df2c1be9fa..04dc8ae72d 100644 --- a/tests/integration/targets/launchd/tasks/tests/test_reload.yml +++ b/tests/integration/targets/launchd/tasks/tests/test_reload.yml @@ -9,9 +9,9 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result_check_mode" - check_mode: yes + check_mode: true - name: "[{{ item }}] Assert that everything work in check mode" assert: @@ -23,7 +23,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result" @@ -37,13 +37,13 @@ template: src: "modified.{{ launchd_service_name }}.plist.j2" dest: "{{ launchd_plist_location }}" - become: yes + become: true - name: "[{{ item }}] When reloading the service..." launchd: name: "{{ launchd_service_name }}" state: reloaded - become: yes + become: true register: "test_1_launchd_reload_result" - name: "[{{ item }}] Validate that service was reloaded" @@ -60,7 +60,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result" diff --git a/tests/integration/targets/launchd/tasks/tests/test_restart.yml b/tests/integration/targets/launchd/tasks/tests/test_restart.yml index 08ef62d919..44064cef12 100644 --- a/tests/integration/targets/launchd/tasks/tests/test_restart.yml +++ b/tests/integration/targets/launchd/tasks/tests/test_restart.yml @@ -9,7 +9,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result" @@ -17,9 +17,9 @@ launchd: name: "{{ launchd_service_name }}" state: restarted - become: yes + become: true register: "test_1_launchd_restart_result_check_mode" - check_mode: yes + check_mode: true - name: "[{{ item }}] Validate that service was restarted in check mode" assert: @@ -31,7 +31,7 @@ launchd: name: "{{ launchd_service_name }}" state: restarted - become: yes + become: true register: "test_1_launchd_restart_result" - name: "[{{ item }}] Validate that service was restarted" diff --git a/tests/integration/targets/launchd/tasks/tests/test_runatload.yml b/tests/integration/targets/launchd/tasks/tests/test_runatload.yml index 03059fc884..87c72d5329 100644 --- a/tests/integration/targets/launchd/tasks/tests/test_runatload.yml +++ b/tests/integration/targets/launchd/tasks/tests/test_runatload.yml @@ -9,8 +9,8 @@ launchd: name: "{{ launchd_service_name }}" state: started - enabled: yes - become: yes + enabled: true + become: true register: test_1_launchd_start_result - name: "[{{ item }}] Validate that service was started" @@ -31,6 +31,6 @@ \s+RunAtLoad \s+ replace: found_run_at_load - check_mode: yes + check_mode: true register: contents_would_have failed_when: not contents_would_have is changed diff --git a/tests/integration/targets/launchd/tasks/tests/test_start_stop.yml b/tests/integration/targets/launchd/tasks/tests/test_start_stop.yml index 2a78f89c12..bf59979aaf 100644 --- a/tests/integration/targets/launchd/tasks/tests/test_start_stop.yml +++ b/tests/integration/targets/launchd/tasks/tests/test_start_stop.yml @@ -9,9 +9,9 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result_check_mode" - check_mode: yes + check_mode: true - name: "[{{ item }}] Validate that service was started in check mode" @@ -25,7 +25,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result" @@ -46,7 +46,7 @@ launchd: name: "{{ launchd_service_name }}" state: stopped - become: yes + become: true register: "test_2_launchd_stop_result" - name: "[{{ item }}] Validate that service was stopped after it was started" @@ -65,7 +65,7 @@ launchd: name: "{{ launchd_service_name }}" state: stopped - become: yes + become: true register: "test_3_launchd_stop_result" - name: "[{{ item }}] Validate that service can be stopped after being already stopped" @@ -84,7 +84,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_4_launchd_start_result" - name: "[{{ item }}] Validate that service was started..." @@ -102,7 +102,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_5_launchd_start_result" - name: "[{{ item }}] Validate that service is still in the same state as before" diff --git a/tests/integration/targets/launchd/tasks/tests/test_unload.yml b/tests/integration/targets/launchd/tasks/tests/test_unload.yml index aee9d8b5ee..8915aac8b6 100644 --- a/tests/integration/targets/launchd/tasks/tests/test_unload.yml +++ b/tests/integration/targets/launchd/tasks/tests/test_unload.yml @@ -9,7 +9,7 @@ launchd: name: "{{ launchd_service_name }}" state: started - become: yes + become: true register: "test_1_launchd_start_result" @@ -17,9 +17,9 @@ launchd: name: "{{ launchd_service_name }}" state: unloaded - become: yes + become: true register: "test_1_launchd_unloaded_result_check_mode" - check_mode: yes + check_mode: true - name: "[{{ item }}] Validate that service was unloaded in check mode" assert: @@ -32,7 +32,7 @@ launchd: name: "{{ launchd_service_name }}" state: unloaded - become: yes + become: true register: "test_1_launchd_unloaded_result" - name: "[{{ item }}] Validate that service was unloaded" @@ -51,7 +51,7 @@ launchd: name: "{{ launchd_service_name }}" state: unloaded - become: yes + become: true register: "test_2_launchd_unloaded_result" - name: "[{{ item }}] Validate that service did not change and is still unloaded" diff --git a/tests/integration/targets/ldap_search/tasks/tests/basic.yml b/tests/integration/targets/ldap_search/tasks/tests/basic.yml index ab6c745277..36d245d396 100644 --- a/tests/integration/targets/ldap_search/tasks/tests/basic.yml +++ b/tests/integration/targets/ldap_search/tasks/tests/basic.yml @@ -14,7 +14,7 @@ dn: "ou=users,dc=example,dc=com" scope: "onelevel" filter: "(uid=ldaptest)" - ignore_errors: yes + ignore_errors: true register: output - name: assert that test LDAP user can be found diff --git a/tests/integration/targets/lookup_dig/tasks/main.yml b/tests/integration/targets/lookup_dig/tasks/main.yml index 5c0ebeb761..2f48333cb0 100644 --- a/tests/integration/targets/lookup_dig/tasks/main.yml +++ b/tests/integration/targets/lookup_dig/tasks/main.yml @@ -29,7 +29,7 @@ - name: Test dig lookup with non-existing domain and fail_on_error=yes set_fact: dig_nonexisting_fail_yes: "{{ lookup('community.general.dig', 'non-existing.domain.', 'fail_on_error=yes') }}" - ignore_errors: yes + ignore_errors: true register: dig_nonexisting_fail_yes_result - name: Verify that the task failed diff --git a/tests/integration/targets/lookup_passwordstore/tasks/package.yml b/tests/integration/targets/lookup_passwordstore/tasks/package.yml index 89d750ee6d..3623101c86 100644 --- a/tests/integration/targets/lookup_passwordstore/tasks/package.yml +++ b/tests/integration/targets/lookup_passwordstore/tasks/package.yml @@ -32,14 +32,14 @@ package: name: password-store state: present - update_cache: yes - disable_gpg_check: yes + update_cache: true + disable_gpg_check: true when: ansible_facts.pkg_mgr in ['zypper', 'community.general.zypper'] # See https://github.com/gopasspw/gopass/issues/1849#issuecomment-802789285 - name: Install gopass on Debian when: ansible_facts.os_family == 'Debian' - become: yes + become: true block: - name: Fetch gopass repo keyring ansible.builtin.get_url: @@ -54,7 +54,7 @@ - name: Update apt-cache and install gopass package ansible.builtin.apt: name: gopass - update_cache: yes + update_cache: true - name: Install on macOS when: ansible_facts.distribution == 'MacOSX' @@ -75,8 +75,8 @@ - pass - gopass state: present - update_homebrew: no - become: yes + update_homebrew: false + become: true become_user: "{{ brew_stat.stat.pw_name }}" # Newer versions of brew want to compile a package which takes a long time. Do not upgrade homebrew until a # proper solution can be found diff --git a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml index 583aafd108..65a578c962 100644 --- a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml +++ b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml @@ -14,7 +14,7 @@ - name: Stop gpg-agent so we can remove any locks on the GnuPG dir command: gpgconf --kill gpg-agent - ignore_errors: yes + ignore_errors: true - name: Remove previous password files and directory file: diff --git a/tests/integration/targets/lookup_random_pet/test.yml b/tests/integration/targets/lookup_random_pet/test.yml index 31ce38c4d0..c61461867a 100644 --- a/tests/integration/targets/lookup_random_pet/test.yml +++ b/tests/integration/targets/lookup_random_pet/test.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - hosts: localhost - gather_facts: no + gather_facts: false tasks: - name: Call plugin set_fact: diff --git a/tests/integration/targets/lookup_random_string/test.yml b/tests/integration/targets/lookup_random_string/test.yml index 2ce57ad2cb..b1f6234102 100644 --- a/tests/integration/targets/lookup_random_string/test.yml +++ b/tests/integration/targets/lookup_random_string/test.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - hosts: localhost - gather_facts: no + gather_facts: false tasks: - name: Call plugin set_fact: @@ -25,7 +25,7 @@ - name: Raise error when impossible constraints are provided set_fact: impossible: "{{ query('community.general.random_string', upper=false, lower=false, special=false, numbers=false) }}" - ignore_errors: yes + ignore_errors: true register: impossible_result - name: Check results diff --git a/tests/integration/targets/lvg/tasks/test_pvresize.yml b/tests/integration/targets/lvg/tasks/test_pvresize.yml index eef9503040..f15add91cb 100644 --- a/tests/integration/targets/lvg/tasks/test_pvresize.yml +++ b/tests/integration/targets/lvg/tasks/test_pvresize.yml @@ -27,7 +27,7 @@ lvg: vg: testvg pvs: "{{ loop_device1 }}" - pvresize: no + pvresize: false register: cmd_result - assert: @@ -47,8 +47,8 @@ lvg: vg: testvg pvs: "{{ loop_device1 }}" - pvresize: yes - check_mode: yes + pvresize: true + check_mode: true register: cmd_result - name: Assert that the module returned the state was changed @@ -69,7 +69,7 @@ lvg: vg: testvg pvs: "{{ loop_device1 }}" - pvresize: yes + pvresize: true - name: Gets current vg size shell: vgs -v testvg -o pv_size --noheading --units b | xargs diff --git a/tests/integration/targets/mail/tasks/main.yml b/tests/integration/targets/mail/tasks/main.yml index a79d9e9162..4f3f90a51d 100644 --- a/tests/integration/targets/mail/tasks/main.yml +++ b/tests/integration/targets/mail/tasks/main.yml @@ -15,7 +15,7 @@ pip: name: smtpd-tls state: present - ignore_errors: yes + ignore_errors: true register: smtpd_tls - name: Install test smtpserver @@ -70,7 +70,7 @@ body: Test body 4 attach: /etc/group secure: starttls - ignore_errors: yes + ignore_errors: true register: starttls_support # NOTE: This might fail if smtpd-tls is missing or python 2.7.8 or older is used @@ -83,7 +83,7 @@ body: Test body 5 attach: /etc/group secure: always - ignore_errors: yes + ignore_errors: true register: tls_support - fail: diff --git a/tests/integration/targets/mas/tasks/main.yml b/tests/integration/targets/mas/tasks/main.yml index ce50c39eb1..f659160dcc 100644 --- a/tests/integration/targets/mas/tasks/main.yml +++ b/tests/integration/targets/mas/tasks/main.yml @@ -14,7 +14,7 @@ mas: id: 421879749 state: absent - become: yes + become: true - name: Determine whether the app is installed stat: @@ -36,7 +36,7 @@ id: 421879749 state: present register: install_check - check_mode: yes + check_mode: true - name: Ensure that the status would have changed assert: @@ -98,8 +98,8 @@ id: 421879749 state: absent register: uninstall_check - become: yes - check_mode: yes + become: true + check_mode: true - name: Ensure that the status would have changed assert: @@ -122,7 +122,7 @@ id: 421879749 state: absent register: uninstall - become: yes + become: true - name: Ensure that the status changed assert: @@ -149,7 +149,7 @@ id: 421879749 state: absent register: uninstall_again - become: yes + become: true - name: Ensure that the status is unchanged (already uninstalled) assert: diff --git a/tests/integration/targets/module_helper/library/mstate.py b/tests/integration/targets/module_helper/library/mstate.py index 9e70ed4364..bfaab03755 100644 --- a/tests/integration/targets/module_helper/library/mstate.py +++ b/tests/integration/targets/module_helper/library/mstate.py @@ -18,7 +18,7 @@ options: a: description: aaaa type: int - required: yes + required: true b: description: bbbb type: str diff --git a/tests/integration/targets/module_helper/tasks/mdepfail.yml b/tests/integration/targets/module_helper/tasks/mdepfail.yml index 3f4ed9039d..1655be54e3 100644 --- a/tests/integration/targets/module_helper/tasks/mdepfail.yml +++ b/tests/integration/targets/module_helper/tasks/mdepfail.yml @@ -5,7 +5,7 @@ - name: test failing dependency mdepfail: a: 123 - ignore_errors: yes + ignore_errors: true register: result - name: assert failing dependency diff --git a/tests/integration/targets/module_helper/tasks/msimple.yml b/tests/integration/targets/module_helper/tasks/msimple.yml index 9010c455ca..03818639c7 100644 --- a/tests/integration/targets/module_helper/tasks/msimple.yml +++ b/tests/integration/targets/module_helper/tasks/msimple.yml @@ -18,7 +18,7 @@ - name: test msimple 2 msimple: a: 101 - ignore_errors: yes + ignore_errors: true register: simple2 - name: assert simple2 diff --git a/tests/integration/targets/module_helper/tasks/msimple_output_conflict.yml b/tests/integration/targets/module_helper/tasks/msimple_output_conflict.yml index 55e0a06eca..62fe1e327b 100644 --- a/tests/integration/targets/module_helper/tasks/msimple_output_conflict.yml +++ b/tests/integration/targets/module_helper/tasks/msimple_output_conflict.yml @@ -37,7 +37,7 @@ msimple: a: 101 m: a message in a bottle - ignore_errors: yes + ignore_errors: true register: simple3 - name: assert simple3 diff --git a/tests/integration/targets/monit/tasks/main.yml b/tests/integration/targets/monit/tasks/main.yml index 73b6cfc8a6..ea85954125 100644 --- a/tests/integration/targets/monit/tasks/main.yml +++ b/tests/integration/targets/monit/tasks/main.yml @@ -17,7 +17,7 @@ - ansible_distribution_major_version is version('9', '<') - name: create required directories - become: yes + become: true file: path: "{{ item }}" state: directory @@ -27,7 +27,7 @@ - "{{ process_root }}" - name: install monit - become: yes + become: true package: name: monit state: present @@ -40,13 +40,13 @@ - 'defaults.yml' - name: monit config - become: yes + become: true template: src: "monitrc.j2" dest: "{{ monitrc }}" - name: copy process file - become: yes + become: true copy: src: httpd_echo.py dest: "{{ process_file }}" @@ -73,7 +73,7 @@ - python-daemon - name: restart monit - become: yes + become: true service: name: monit state: restarted @@ -82,13 +82,13 @@ always: - name: stop monit - become: yes + become: true service: name: monit state: stopped - name: uninstall monit - become: yes + become: true package: name: monit state: absent diff --git a/tests/integration/targets/mssql_script/tasks/main.yml b/tests/integration/targets/mssql_script/tasks/main.yml index 2ecfd51c15..7f8d6d1840 100644 --- a/tests/integration/targets/mssql_script/tasks/main.yml +++ b/tests/integration/targets/mssql_script/tasks/main.yml @@ -169,7 +169,7 @@ login_host: "{{ mssql_host }}" login_port: "{{ mssql_port }}" script: SELECT Invalid_Column FROM Does_Not_Exist WITH Invalid Syntax - check_mode: yes + check_mode: true register: check_mode - assert: that: check_mode.query_results is undefined diff --git a/tests/integration/targets/npm/tasks/setup.yml b/tests/integration/targets/npm/tasks/setup.yml index 0c7a9eabfb..bad927915b 100644 --- a/tests/integration/targets/npm/tasks/setup.yml +++ b/tests/integration/targets/npm/tasks/setup.yml @@ -7,5 +7,5 @@ unarchive: src: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/npm/{{ nodejs_path }}.tar.gz' dest: '{{ remote_tmp_dir }}' - remote_src: yes + remote_src: true creates: '{{ remote_tmp_dir }}/{{ nodejs_path }}.tar.gz' diff --git a/tests/integration/targets/osx_defaults/tasks/main.yml b/tests/integration/targets/osx_defaults/tasks/main.yml index 0de351991a..c3cb09d394 100644 --- a/tests/integration/targets/osx_defaults/tasks/main.yml +++ b/tests/integration/targets/osx_defaults/tasks/main.yml @@ -16,7 +16,7 @@ type: string state: present register: missing_value - ignore_errors: yes + ignore_errors: true - name: Test if state and value are required together assert: @@ -31,7 +31,7 @@ value: Centimeter state: present register: measure_task_check_mode - check_mode: yes + check_mode: true - name: Test if AppleMeasurementUnits value is changed to Centimeters in check_mode assert: @@ -163,7 +163,7 @@ key: ExampleKeyToRemove state: absent register: absent_check_mode_task - check_mode: yes + check_mode: true - debug: msg: "{{ absent_check_mode_task }}" @@ -225,7 +225,7 @@ value: - 'Value with spaces' type: array - array_add: yes + array_add: true register: test_array_add - assert: @@ -238,7 +238,7 @@ value: - 'Value with spaces' type: array - array_add: yes + array_add: true register: test_array_add - assert: diff --git a/tests/integration/targets/pacman/tasks/remove_nosave.yml b/tests/integration/targets/pacman/tasks/remove_nosave.yml index c6d1c961cb..2271ebc037 100644 --- a/tests/integration/targets/pacman/tasks/remove_nosave.yml +++ b/tests/integration/targets/pacman/tasks/remove_nosave.yml @@ -61,7 +61,7 @@ - name: Remove {{ package_name }} - nosave pacman: name: '{{ package_name }}' - remove_nosave: yes + remove_nosave: true state: absent - name: Make sure {{config_file}}.pacsave does not exist diff --git a/tests/integration/targets/pam_limits/tasks/main.yml b/tests/integration/targets/pam_limits/tasks/main.yml index 1c73394fb3..5ad68f4a64 100644 --- a/tests/integration/targets/pam_limits/tasks/main.yml +++ b/tests/integration/targets/pam_limits/tasks/main.yml @@ -19,7 +19,7 @@ limit_item: nofile value: '64000' dest: "{{ test_limit_file }}" - check_mode: yes + check_mode: true register: check_mode_test - name: Test that check mode is working diff --git a/tests/integration/targets/pipx/tasks/main.yml b/tests/integration/targets/pipx/tasks/main.yml index 00f54aeb24..267c2a2d1a 100644 --- a/tests/integration/targets/pipx/tasks/main.yml +++ b/tests/integration/targets/pipx/tasks/main.yml @@ -32,7 +32,7 @@ - name: install application tox again force community.general.pipx: name: tox - force: yes + force: true register: install_tox_again_force - name: uninstall application tox @@ -68,7 +68,7 @@ community.general.pipx: state: reinstall register: reinstall_noname - ignore_errors: yes + ignore_errors: true - name: upgrade tox from 3.24.0 community.general.pipx: @@ -80,13 +80,13 @@ community.general.pipx: state: upgrade register: upgrade_noname - ignore_errors: yes + ignore_errors: true - name: downgrade tox 3.24.0 community.general.pipx: name: tox source: tox==3.24.0 - force: yes + force: true register: downgrade_tox_324 - name: cleanup tox 3.24.0 diff --git a/tests/integration/targets/pkgng/tasks/create-outofdate-pkg.yml b/tests/integration/targets/pkgng/tasks/create-outofdate-pkg.yml index e63cb72312..4028c57d8f 100644 --- a/tests/integration/targets/pkgng/tasks/create-outofdate-pkg.yml +++ b/tests/integration/targets/pkgng/tasks/create-outofdate-pkg.yml @@ -31,7 +31,7 @@ - name: Find created package file find: path: '{{ pkgng_test_outofdate_pkg_tempdir.path }}' - use_regex: yes + use_regex: true pattern: '.*\.(pkg|tzst|t[xbg]z|tar)' register: pkgng_test_outofdate_pkg_tempfile @@ -42,7 +42,7 @@ - name: Copy the created package file to the expected location copy: - remote_src: yes + remote_src: true src: '{{ pkgng_test_outofdate_pkg_tempfile.files[0].path }}' dest: '{{ pkgng_test_outofdate_pkg_path }}' diff --git a/tests/integration/targets/pkgng/tasks/freebsd.yml b/tests/integration/targets/pkgng/tasks/freebsd.yml index a822b4c7e9..fd9a4a4c5b 100644 --- a/tests/integration/targets/pkgng/tasks/freebsd.yml +++ b/tests/integration/targets/pkgng/tasks/freebsd.yml @@ -37,15 +37,15 @@ - name: Verify package sentinel file is present stat: path: '{{ pkgng_test_pkg_sentinelfile_path }}' - get_attributes: no - get_checksum: no - get_mime: no + get_attributes: false + get_checksum: false + get_mime: false register: pkgng_example3_stat_before - name: Install package (checkmode) pkgng: name: '{{ pkgng_test_pkg_name }}' - check_mode: yes + check_mode: true register: pkgng_example3_checkmode - name: Remove package @@ -63,9 +63,9 @@ - name: Verify package sentinel file is not present stat: path: '{{ pkgng_test_pkg_sentinelfile_path }}' - get_attributes: no - get_checksum: no - get_mime: no + get_attributes: false + get_checksum: false + get_mime: false register: pkgng_example3_stat_after - name: Ensure pkgng installs package correctly @@ -104,14 +104,14 @@ pkgng: name: '*' state: latest - check_mode: yes + check_mode: true register: pkgng_example4_wildcard_checkmode - name: Check for available package upgrade (checkmode) pkgng: name: '{{ pkgng_test_pkg_name }}' state: latest - check_mode: yes + check_mode: true register: pkgng_example4_checkmode - name: Upgrade out-of-date package @@ -183,7 +183,7 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' state: absent - check_mode: yes + check_mode: true register: pkgng_example5_prepare - name: Install three packages @@ -219,7 +219,7 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' state: absent - check_mode: yes + check_mode: true register: pkgng_example6_check - name: Create out-of-date test package @@ -279,7 +279,7 @@ pkgng: name: autotools state: absent - autoremove: yes + autoremove: true register: pkgng_example7 - name: Check if autoremove uninstalled known autotools dependencies @@ -290,7 +290,7 @@ - libtool - m4 state: absent - check_mode: yes + check_mode: true register: pkgng_example7_cleanup - name: Ensure pkgng autoremove works correctly @@ -313,7 +313,7 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' annotation: '+ansibletest_example8=duplicate' - ignore_errors: yes + ignore_errors: true register: pkgng_example8_add_annotation_failure - name: Verify annotation is actually there @@ -324,14 +324,14 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' annotation: '+ansibletest_example8=added' - check_mode: yes + check_mode: true register: pkgng_example8_add_annotation_checkmode_nochange - name: Install and annotate single package (checkmode, changed) pkgng: name: '{{ pkgng_test_pkg_name }}' annotation: '+ansibletest_example8_checkmode=added' - check_mode: yes + check_mode: true register: pkgng_example8_add_annotation_checkmode_change - name: Verify check_mode did not add an annotation @@ -348,7 +348,7 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' annotation: ':ansiblemissing=modified' - ignore_errors: yes + ignore_errors: true register: pkgng_example8_modify_annotation_failure - name: Verify annotation has been modified @@ -451,7 +451,7 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' annotation: '{{ item }}' - ignore_errors: yes + ignore_errors: true register: pkgng_example8_invalid_annotation_failure loop: - 'naked_string' @@ -484,7 +484,7 @@ pkgng: name: '{{ pkgng_test_pkg_name }}' pkgsite: DoesNotExist - ignore_errors: yes + ignore_errors: true register: pkgng_example10_invalid_pkgsite_failure - name: Ensure invalid pkgsite fails as expected @@ -524,21 +524,21 @@ vars: pkgng_test_rootdir: /usr/jails/testjail pkgng_test_install_prefix: /usr/jails/testjail - pkgng_test_install_cleanup: yes + pkgng_test_install_cleanup: true - name: Install package in jail include_tasks: install_single_package.yml vars: pkgng_test_jail: testjail pkgng_test_install_prefix: /usr/jails/testjail - pkgng_test_install_cleanup: yes + pkgng_test_install_cleanup: true - name: Install package in jail as chroot include_tasks: install_single_package.yml vars: pkgng_test_chroot: /usr/jails/testjail pkgng_test_install_prefix: /usr/jails/testjail - pkgng_test_install_cleanup: yes + pkgng_test_install_cleanup: true always: - name: Stop and remove testjail failed_when: false diff --git a/tests/integration/targets/pkgng/tasks/install_single_package.yml b/tests/integration/targets/pkgng/tasks/install_single_package.yml index 00768085ca..5ba529af35 100644 --- a/tests/integration/targets/pkgng/tasks/install_single_package.yml +++ b/tests/integration/targets/pkgng/tasks/install_single_package.yml @@ -6,9 +6,9 @@ - name: Verify package sentinel file is not present stat: path: '{{ pkgng_test_install_prefix | default("") }}{{ pkgng_test_pkg_sentinelfile_path }}' - get_attributes: no - get_checksum: no - get_mime: no + get_attributes: false + get_checksum: false + get_mime: false register: pkgng_install_stat_before - name: Install package @@ -23,21 +23,21 @@ pkgng: <<: *pkgng_install_params state: absent - check_mode: yes + check_mode: true register: pkgng_install_checkmode - name: Install package (idempotent, cached) pkgng: <<: *pkgng_install_params - cached: yes + cached: true register: pkgng_install_idempotent_cached - name: Verify package sentinel file is present stat: path: '{{ pkgng_test_install_prefix | default("") }}{{ pkgng_test_pkg_sentinelfile_path }}' - get_attributes: no - get_checksum: no - get_mime: no + get_attributes: false + get_checksum: false + get_mime: false register: pkgng_install_stat_after - name: Remove test package (if requested) diff --git a/tests/integration/targets/pkgng/tasks/setup-testjail.yml b/tests/integration/targets/pkgng/tasks/setup-testjail.yml index 99505af591..3055d29e88 100644 --- a/tests/integration/targets/pkgng/tasks/setup-testjail.yml +++ b/tests/integration/targets/pkgng/tasks/setup-testjail.yml @@ -28,7 +28,7 @@ service: name: pf state: started - enabled: yes + enabled: true - name: Install ezjail pkgng: @@ -49,11 +49,11 @@ line: ezjail_ftphost=http://ftp-archive.freebsd.org - name: Start ezjail - ignore_errors: yes + ignore_errors: true service: name: ezjail state: started - enabled: yes + enabled: true - name: Redirect logs depending on verbosity set_fact: @@ -84,7 +84,7 @@ dest: /usr/jails/testjail/etc/resolv.conf regexp: "^nameserver[[:blank:]]+{{ item }}$" line: "nameserver {{ item }}" - create: yes + create: true loop: - "1.1.1.1" - "1.0.0.1" diff --git a/tests/integration/targets/pkgutil/tasks/main.yml b/tests/integration/targets/pkgutil/tasks/main.yml index e6f32ccc7a..8ceb4adcc3 100644 --- a/tests/integration/targets/pkgutil/tasks/main.yml +++ b/tests/integration/targets/pkgutil/tasks/main.yml @@ -18,7 +18,7 @@ pkgutil: name: CSWtop state: present - check_mode: yes + check_mode: true register: cm_add_package - name: Verify cm_add_package @@ -41,7 +41,7 @@ pkgutil: name: CSWtop state: present - check_mode: yes + check_mode: true register: cm_add_package_again - name: Verify cm_add_package_again @@ -66,7 +66,7 @@ pkgutil: name: CSWtop state: absent - check_mode: yes + check_mode: true register: cm_remove_package - name: Verify cm_remove_package @@ -89,7 +89,7 @@ pkgutil: name: CSWtop state: absent - check_mode: yes + check_mode: true register: cm_remove_package_again - name: Verify cm_remove_package_again diff --git a/tests/integration/targets/read_csv/tasks/main.yml b/tests/integration/targets/read_csv/tasks/main.yml index 325a102c21..a21af95182 100644 --- a/tests/integration/targets/read_csv/tasks/main.yml +++ b/tests/integration/targets/read_csv/tasks/main.yml @@ -68,7 +68,7 @@ read_csv: path: users_nonunique.csv key: name - unique: no + unique: false delimiter: ';' register: users_nonunique @@ -90,7 +90,7 @@ path: users_nonunique.csv dialect: placebo register: users_placebo - ignore_errors: yes + ignore_errors: true - assert: that: @@ -140,9 +140,9 @@ read_csv: path: users_broken.csv key: name - strict: yes + strict: true register: users_broken - ignore_errors: yes + ignore_errors: true - assert: that: diff --git a/tests/integration/targets/redis_info/tasks/main.yml b/tests/integration/targets/redis_info/tasks/main.yml index e696066b26..4a11de3650 100644 --- a/tests/integration/targets/redis_info/tasks/main.yml +++ b/tests/integration/targets/redis_info/tasks/main.yml @@ -24,7 +24,7 @@ login_host: 127.0.0.1 login_port: "{{ master_port }}" login_password: "{{ redis_password }}" - check_mode: yes + check_mode: true register: result - assert: diff --git a/tests/integration/targets/scaleway_compute/tasks/ip.yml b/tests/integration/targets/scaleway_compute/tasks/ip.yml index f6b7840fd9..094176ce86 100644 --- a/tests/integration/targets/scaleway_compute/tasks/ip.yml +++ b/tests/integration/targets/scaleway_compute/tasks/ip.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a server with no IP (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present @@ -66,7 +66,7 @@ # Add a dynamic IP to the instance - name: Patch server tags (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present @@ -127,7 +127,7 @@ # Remove dynamic IP - name: Patch server tags (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present diff --git a/tests/integration/targets/scaleway_compute/tasks/security_group.yml b/tests/integration/targets/scaleway_compute/tasks/security_group.yml index 6126514212..59f81e6af1 100644 --- a/tests/integration/targets/scaleway_compute/tasks/security_group.yml +++ b/tests/integration/targets/scaleway_compute/tasks/security_group.yml @@ -20,7 +20,7 @@ - block: - name: Create a server with security_group (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present @@ -80,7 +80,7 @@ - server_creation_confirmation_task is not changed - name: Keep current security_group (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present diff --git a/tests/integration/targets/scaleway_compute/tasks/state.yml b/tests/integration/targets/scaleway_compute/tasks/state.yml index 8f015ad337..b3f2567626 100644 --- a/tests/integration/targets/scaleway_compute/tasks/state.yml +++ b/tests/integration/targets/scaleway_compute/tasks/state.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a server (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present @@ -61,7 +61,7 @@ - server_creation_confirmation_task is not changed - name: Patch server tags (Check) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: present @@ -124,7 +124,7 @@ - server_patching_confirmation_task is not changed - name: Run it (Check mode) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: running @@ -187,7 +187,7 @@ - server_run_confirmation_task is not changed - name: Reboot it (Check mode) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: restarted @@ -229,7 +229,7 @@ - server_reboot_task is changed - name: Stop it (Check mode) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: stopped @@ -292,7 +292,7 @@ - server_stop_confirmation_task is not changed - name: Destroy it (Check mode) - check_mode: yes + check_mode: true scaleway_compute: name: '{{ scaleway_name }}' state: absent @@ -355,7 +355,7 @@ - server_destroy_confirmation_task is not changed - name: Testing for unauthorized organization - ignore_errors: yes + ignore_errors: true scaleway_compute: name: '{{ scaleway_name }}' state: present @@ -373,7 +373,7 @@ - unauthorized_organization_task is not changed - name: Testing for unexisting image - ignore_errors: yes + ignore_errors: true scaleway_compute: name: '{{ scaleway_name }}' state: present diff --git a/tests/integration/targets/scaleway_container/tasks/main.yml b/tests/integration/targets/scaleway_container/tasks/main.yml index 1ac5bf1768..d0bf4206f6 100644 --- a/tests/integration/targets/scaleway_container/tasks/main.yml +++ b/tests/integration/targets/scaleway_container/tasks/main.yml @@ -18,7 +18,7 @@ register: integration_container_namespace - name: Create a container (Check) - check_mode: yes + check_mode: true community.general.scaleway_container: state: present name: '{{ name }}' @@ -87,7 +87,7 @@ - cn_creation_confirmation_task.container.status in ["created", "ready"] - name: Update container (Check) - check_mode: yes + check_mode: true community.general.scaleway_container: state: present name: '{{ name }}' @@ -156,7 +156,7 @@ - cn_update_confirmation_task.container.status in ["created", "ready"] - name: Update container secret variables (Check) - check_mode: yes + check_mode: true community.general.scaleway_container: state: present name: '{{ name }}' @@ -227,7 +227,7 @@ - "'hashed_value' in cn_update_secret_confirmation_task.container.secret_environment_variables[0]" - name: Delete container (Check) - check_mode: yes + check_mode: true community.general.scaleway_container: state: absent name: '{{ name }}' diff --git a/tests/integration/targets/scaleway_container_namespace/tasks/main.yml b/tests/integration/targets/scaleway_container_namespace/tasks/main.yml index bab42ee13f..73e43ff156 100644 --- a/tests/integration/targets/scaleway_container_namespace/tasks/main.yml +++ b/tests/integration/targets/scaleway_container_namespace/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a container namespace (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_namespace: state: present name: '{{ name }}' @@ -72,7 +72,7 @@ - cn_creation_confirmation_task.container_namespace.status == "ready" - name: Update container namespace (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_namespace: state: present name: '{{ name }}' @@ -135,7 +135,7 @@ - cn_update_confirmation_task.container_namespace.status == "ready" - name: Update container namespace secret variables (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_namespace: state: present name: '{{ name }}' @@ -200,7 +200,7 @@ - "'hashed_value' in cn_update_secret_confirmation_task.container_namespace.secret_environment_variables[0]" - name: Delete container namespace (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_namespace: state: absent name: '{{ name }}' diff --git a/tests/integration/targets/scaleway_container_registry/tasks/main.yml b/tests/integration/targets/scaleway_container_registry/tasks/main.yml index 24b1f0cbc9..91cea20f3f 100644 --- a/tests/integration/targets/scaleway_container_registry/tasks/main.yml +++ b/tests/integration/targets/scaleway_container_registry/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a container registry (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_registry: state: present name: '{{ name }}' @@ -66,7 +66,7 @@ - cr_creation_confirmation_task.container_registry.status == "ready" - name: Update container registry (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_registry: state: present name: '{{ name }}' @@ -123,7 +123,7 @@ - cr_update_confirmation_task.container_registry.status == "ready" - name: Delete container registry (Check) - check_mode: yes + check_mode: true community.general.scaleway_container_registry: state: absent name: '{{ name }}' diff --git a/tests/integration/targets/scaleway_database_backup/tasks/main.yml b/tests/integration/targets/scaleway_database_backup/tasks/main.yml index b0af65c0ae..fdef03fb30 100644 --- a/tests/integration/targets/scaleway_database_backup/tasks/main.yml +++ b/tests/integration/targets/scaleway_database_backup/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a backup (Check) - check_mode: yes + check_mode: true scaleway_database_backup: name: '{{ scaleway_name }}' state: present @@ -63,7 +63,7 @@ - backup_creation_confirmation_task is not changed - name: Patch backup name (Check) - check_mode: yes + check_mode: true scaleway_database_backup: name: '{{ scaleway_name }}-changed' state: present @@ -115,7 +115,7 @@ - backup_patching_confirmation_task is not changed - name: Export backup (Check) - check_mode: yes + check_mode: true scaleway_database_backup: id: '{{ backup_creation_task.metadata.id }}' state: exported @@ -161,7 +161,7 @@ - backup_export_confirmation_task.metadata.download_url != "" - name: Restore backup (Check) - check_mode: yes + check_mode: true scaleway_database_backup: id: '{{ backup_creation_task.metadata.id }}' state: restored @@ -195,7 +195,7 @@ - backup_restore_task is changed - name: Delete backup (Check) - check_mode: yes + check_mode: true scaleway_database_backup: id: '{{ backup_creation_task.metadata.id }}' state: absent diff --git a/tests/integration/targets/scaleway_function/tasks/main.yml b/tests/integration/targets/scaleway_function/tasks/main.yml index 92ebfb8f7d..d4552d0b39 100644 --- a/tests/integration/targets/scaleway_function/tasks/main.yml +++ b/tests/integration/targets/scaleway_function/tasks/main.yml @@ -18,7 +18,7 @@ register: integration_function_namespace - name: Create a function (Check) - check_mode: yes + check_mode: true community.general.scaleway_function: state: present name: '{{ name }}' @@ -84,7 +84,7 @@ - fn_creation_confirmation_task.function.status in ["created", "ready"] - name: Update function (Check) - check_mode: yes + check_mode: true community.general.scaleway_function: state: present name: '{{ name }}' @@ -150,7 +150,7 @@ - fn_update_confirmation_task.function.status in ["created", "ready"] - name: Update function secret variables (Check) - check_mode: yes + check_mode: true community.general.scaleway_function: state: present name: '{{ name }}' @@ -218,7 +218,7 @@ - "'hashed_value' in fn_update_secret_confirmation_task.function.secret_environment_variables[0]" - name: Delete function (Check) - check_mode: yes + check_mode: true community.general.scaleway_function: state: absent name: '{{ name }}' diff --git a/tests/integration/targets/scaleway_function_namespace/tasks/main.yml b/tests/integration/targets/scaleway_function_namespace/tasks/main.yml index 78b7c95757..50af4449d5 100644 --- a/tests/integration/targets/scaleway_function_namespace/tasks/main.yml +++ b/tests/integration/targets/scaleway_function_namespace/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a function namespace (Check) - check_mode: yes + check_mode: true community.general.scaleway_function_namespace: state: present name: '{{ name }}' @@ -74,7 +74,7 @@ - "'hashed_value' in fn_creation_task.function_namespace.secret_environment_variables[0]" - name: Update function namespace (Check) - check_mode: yes + check_mode: true community.general.scaleway_function_namespace: state: present name: '{{ name }}' @@ -139,7 +139,7 @@ - "'hashed_value' in fn_creation_task.function_namespace.secret_environment_variables[0]" - name: Update function namespace secret variables (Check) - check_mode: yes + check_mode: true community.general.scaleway_function_namespace: state: present name: '{{ name }}' @@ -204,7 +204,7 @@ - "'hashed_value' in fn_update_secret_confirmation_task.function_namespace.secret_environment_variables[0]" - name: Delete function namespace (Check) - check_mode: yes + check_mode: true community.general.scaleway_function_namespace: state: absent name: '{{ name }}' diff --git a/tests/integration/targets/scaleway_ip/tasks/main.yml b/tests/integration/targets/scaleway_ip/tasks/main.yml index fe0f578fa8..5a396ba4f2 100644 --- a/tests/integration/targets/scaleway_ip/tasks/main.yml +++ b/tests/integration/targets/scaleway_ip/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create IP (Check) - check_mode: yes + check_mode: true scaleway_ip: state: present region: '{{ scaleway_region }}' @@ -78,7 +78,7 @@ - '{{ ip_creation_task.scaleway_ip.server is none }}' - name: Assign reverse to server (Check) - check_mode: yes + check_mode: true scaleway_ip: state: present id: '{{ ip_creation_task.scaleway_ip.id }}' @@ -162,7 +162,7 @@ - server_creation_task is success - name: Assign IP to server (Check) - check_mode: yes + check_mode: true scaleway_ip: state: present id: '{{ ip_creation_task.scaleway_ip.id }}' @@ -229,7 +229,7 @@ - ip_assignation_confirmation_task is not changed - name: Unassign IP to server (Check) - check_mode: yes + check_mode: true scaleway_ip: state: present id: '{{ ip_creation_task.scaleway_ip.id }}' @@ -303,7 +303,7 @@ - '{{ ip_unassignation_task.scaleway_ip.server is none }}' - name: Unassign reverse to IP (Check) - check_mode: yes + check_mode: true scaleway_ip: state: present id: '{{ ip_creation_task.scaleway_ip.id }}' @@ -397,7 +397,7 @@ - server_destroy_task is changed - name: Delete IP (Check) - check_mode: yes + check_mode: true scaleway_ip: state: absent region: '{{ scaleway_region }}' diff --git a/tests/integration/targets/scaleway_lb/tasks/main.yml b/tests/integration/targets/scaleway_lb/tasks/main.yml index 05237e1a78..2567abd078 100644 --- a/tests/integration/targets/scaleway_lb/tasks/main.yml +++ b/tests/integration/targets/scaleway_lb/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create a load-balancer (Check) - check_mode: yes + check_mode: true scaleway_lb: state: present name: '{{ name }}' @@ -87,7 +87,7 @@ - lb_creation_confirmation_task.scaleway_lb.status == "ready" - name: Update load-balancer (Check) - check_mode: yes + check_mode: true scaleway_lb: state: present name: '{{ name }}' @@ -165,7 +165,7 @@ - lb_update_confirmation_task.scaleway_lb.status == "ready" - name: Delete load-balancer (Check) - check_mode: yes + check_mode: true scaleway_lb: state: absent name: '{{ name }}' diff --git a/tests/integration/targets/scaleway_security_group/tasks/main.yml b/tests/integration/targets/scaleway_security_group/tasks/main.yml index 362166e291..cab972ae50 100644 --- a/tests/integration/targets/scaleway_security_group/tasks/main.yml +++ b/tests/integration/targets/scaleway_security_group/tasks/main.yml @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Create security group check - check_mode: yes + check_mode: true scaleway_security_group: state: present region: '{{ scaleway_region }}' @@ -74,7 +74,7 @@ - security_group_creation is not changed - name: Delete security group check - check_mode: yes + check_mode: true scaleway_security_group: state: absent region: '{{ scaleway_region }}' diff --git a/tests/integration/targets/scaleway_sshkey/tasks/main.yml b/tests/integration/targets/scaleway_sshkey/tasks/main.yml index 2871086251..588745abdc 100644 --- a/tests/integration/targets/scaleway_sshkey/tasks/main.yml +++ b/tests/integration/targets/scaleway_sshkey/tasks/main.yml @@ -11,7 +11,7 @@ - scaleway_sshkey: ssh_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDf29yyommeGyKSIgSmX0ISVXP+3x6RUY4JDGLoAMFh2efkfDaRVdsvkvnFuUywgP2RewrjTyLE8w0NpCBHVS5Fm1BAn3yvxOUtTMxTbsQcw6HQ8swJ02+1tewJYjHPwc4GrBqiDo3Nmlq354Us0zBOJg/bBzuEnVD5eJ3GO3gKaCSUYTVrYwO0U4eJE0D9OJeUP9J48kl4ULbCub976+mTHdBvlzRw0Tzfl2kxgdDwlks0l2NefY/uiTdz2oMt092bAY3wZHxjto/DXoChxvaf5s2k8Zb+J7CjimUYnzPlH+zA9F6ROjP5AUu6ZWPd0jOIBl1nDWWb2j/qfNLYM43l sieben@sieben-macbook.local" state: present - check_mode: yes + check_mode: true - scaleway_sshkey: ssh_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDf29yyommeGyKSIgSmX0ISVXP+3x6RUY4JDGLoAMFh2efkfDaRVdsvkvnFuUywgP2RewrjTyLE8w0NpCBHVS5Fm1BAn3yvxOUtTMxTbsQcw6HQ8swJ02+1tewJYjHPwc4GrBqiDo3Nmlq354Us0zBOJg/bBzuEnVD5eJ3GO3gKaCSUYTVrYwO0U4eJE0D9OJeUP9J48kl4ULbCub976+mTHdBvlzRw0Tzfl2kxgdDwlks0l2NefY/uiTdz2oMt092bAY3wZHxjto/DXoChxvaf5s2k8Zb+J7CjimUYnzPlH+zA9F6ROjP5AUu6ZWPd0jOIBl1nDWWb2j/qfNLYM43l sieben@sieben-macbook.local" @@ -31,7 +31,7 @@ - scaleway_sshkey: ssh_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDf29yyommeGyKSIgSmX0ISVXP+3x6RUY4JDGLoAMFh2efkfDaRVdsvkvnFuUywgP2RewrjTyLE8w0NpCBHVS5Fm1BAn3yvxOUtTMxTbsQcw6HQ8swJ02+1tewJYjHPwc4GrBqiDo3Nmlq354Us0zBOJg/bBzuEnVD5eJ3GO3gKaCSUYTVrYwO0U4eJE0D9OJeUP9J48kl4ULbCub976+mTHdBvlzRw0Tzfl2kxgdDwlks0l2NefY/uiTdz2oMt092bAY3wZHxjto/DXoChxvaf5s2k8Zb+J7CjimUYnzPlH+zA9F6ROjP5AUu6ZWPd0jOIBl1nDWWb2j/qfNLYM43l sieben@sieben-macbook.local" state: absent - check_mode: yes + check_mode: true - scaleway_sshkey: ssh_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDf29yyommeGyKSIgSmX0ISVXP+3x6RUY4JDGLoAMFh2efkfDaRVdsvkvnFuUywgP2RewrjTyLE8w0NpCBHVS5Fm1BAn3yvxOUtTMxTbsQcw6HQ8swJ02+1tewJYjHPwc4GrBqiDo3Nmlq354Us0zBOJg/bBzuEnVD5eJ3GO3gKaCSUYTVrYwO0U4eJE0D9OJeUP9J48kl4ULbCub976+mTHdBvlzRw0Tzfl2kxgdDwlks0l2NefY/uiTdz2oMt092bAY3wZHxjto/DXoChxvaf5s2k8Zb+J7CjimUYnzPlH+zA9F6ROjP5AUu6ZWPd0jOIBl1nDWWb2j/qfNLYM43l sieben@sieben-macbook.local" diff --git a/tests/integration/targets/scaleway_user_data/tasks/main.yml b/tests/integration/targets/scaleway_user_data/tasks/main.yml index b1cd856ec8..ce42841277 100644 --- a/tests/integration/targets/scaleway_user_data/tasks/main.yml +++ b/tests/integration/targets/scaleway_user_data/tasks/main.yml @@ -28,7 +28,7 @@ - debug: var=server_id - name: Patch user_data cloud-init configuration (Check) - check_mode: yes + check_mode: true scaleway_user_data: region: '{{ scaleway_region }}' server_id: "{{ server_id }}" diff --git a/tests/integration/targets/sefcontext/tasks/sefcontext.yml b/tests/integration/targets/sefcontext/tasks/sefcontext.yml index e4d2d50baa..8f5039b85a 100644 --- a/tests/integration/targets/sefcontext/tasks/sefcontext.yml +++ b/tests/integration/targets/sefcontext/tasks/sefcontext.yml @@ -28,7 +28,7 @@ path: '/tmp/foo/bar(/.*)?' setype: httpd_sys_content_t state: present - reload: no + reload: false register: first - assert: @@ -41,7 +41,7 @@ path: '/tmp/foo/bar(/.*)?' setype: httpd_sys_content_t state: present - reload: no + reload: false register: second - assert: @@ -54,7 +54,7 @@ path: '/tmp/foo/bar(/.*)?' setype: unlabeled_t state: present - reload: no + reload: false register: third - assert: @@ -67,7 +67,7 @@ path: '/tmp/foo/bar(/.*)?' setype: unlabeled_t state: present - reload: no + reload: false register: fourth - assert: @@ -80,7 +80,7 @@ path: '/tmp/foo/bar(/.*)?' setype: httpd_sys_content_t state: absent - reload: no + reload: false register: fifth - assert: @@ -93,7 +93,7 @@ path: '/tmp/foo/bar(/.*)?' setype: unlabeled_t state: absent - reload: no + reload: false register: sixth - assert: diff --git a/tests/integration/targets/setup_etcd3/tasks/main.yml b/tests/integration/targets/setup_etcd3/tasks/main.yml index ddd7ab8988..fe6b9cd028 100644 --- a/tests/integration/targets/setup_etcd3/tasks/main.yml +++ b/tests/integration/targets/setup_etcd3/tasks/main.yml @@ -86,7 +86,7 @@ unarchive: src: "{{ etcd3_download_url }}" dest: "{{ etcd3_download_location }}" - remote_src: yes + remote_src: true # Running etcd3 and kill afterwards if it wasn't running before. - name: Run etcd3 diff --git a/tests/integration/targets/setup_gnutar/handlers/main.yml b/tests/integration/targets/setup_gnutar/handlers/main.yml index 975e0b47a8..f75354097f 100644 --- a/tests/integration/targets/setup_gnutar/handlers/main.yml +++ b/tests/integration/targets/setup_gnutar/handlers/main.yml @@ -7,5 +7,5 @@ community.general.homebrew: name: gnu-tar state: absent - become: yes + become: true become_user: "{{ brew_stat.stat.pw_name }}" diff --git a/tests/integration/targets/setup_gnutar/tasks/main.yml b/tests/integration/targets/setup_gnutar/tasks/main.yml index c7024666b0..8dbfebf6f8 100644 --- a/tests/integration/targets/setup_gnutar/tasks/main.yml +++ b/tests/integration/targets/setup_gnutar/tasks/main.yml @@ -18,7 +18,7 @@ community.general.homebrew: name: gnu-tar state: present - become: yes + become: true become_user: "{{ brew_stat.stat.pw_name }}" notify: - uninstall gnu-tar diff --git a/tests/integration/targets/setup_mosquitto/tasks/ubuntu.yml b/tests/integration/targets/setup_mosquitto/tasks/ubuntu.yml index dd1c340d08..8222aa175a 100644 --- a/tests/integration/targets/setup_mosquitto/tasks/ubuntu.yml +++ b/tests/integration/targets/setup_mosquitto/tasks/ubuntu.yml @@ -7,7 +7,7 @@ apt: name: apt-transport-https state: latest - force: yes + force: true - name: Install Mosquitto Server apt: diff --git a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml index a42b4b4a03..7c6ab4ef9f 100644 --- a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml +++ b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml @@ -11,19 +11,19 @@ - set_fact: pkg_mgr: community.general.pkgng ansible_pkg_mgr: community.general.pkgng - cacheable: yes + cacheable: true when: ansible_os_family == "FreeBSD" - set_fact: pkg_mgr: community.general.zypper ansible_pkg_mgr: community.general.zypper - cacheable: yes + cacheable: true when: ansible_os_family == "Suse" - set_fact: pkg_mgr: community.general.pacman ansible_pkg_mgr: community.general.pacman - cacheable: yes + cacheable: true when: ansible_os_family == "Archlinux" - shell: diff --git a/tests/integration/targets/setup_postgresql_db/tasks/main.yml b/tests/integration/targets/setup_postgresql_db/tasks/main.yml index 7c9baa4074..3dac4a0986 100644 --- a/tests/integration/targets/setup_postgresql_db/tasks/main.yml +++ b/tests/integration/targets/setup_postgresql_db/tasks/main.yml @@ -50,9 +50,9 @@ - name: Kill all postgres processes shell: 'pkill -u {{ pg_user }}' - become: yes + become: true when: ansible_facts.distribution == 'CentOS' and ansible_facts.distribution_major_version == '8' - ignore_errors: yes + ignore_errors: true - name: stop postgresql service service: name={{ postgresql_service }} state=stopped @@ -202,9 +202,9 @@ - name: Kill all postgres processes shell: 'pkill -u {{ pg_user }}' - become: yes + become: true when: ansible_facts.distribution == 'CentOS' and ansible_facts.distribution_major_version == '8' - ignore_errors: yes + ignore_errors: true register: terminate - name: Stop postgresql service diff --git a/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml b/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml index e19d903e6b..cc74b70afc 100644 --- a/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml +++ b/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml @@ -7,4 +7,4 @@ file: path: "{{ remote_tmp_dir }}" state: absent - no_log: yes + no_log: true diff --git a/tests/integration/targets/setup_remote_tmp_dir_outside_tmp/tasks/default-cleanup.yml b/tests/integration/targets/setup_remote_tmp_dir_outside_tmp/tasks/default-cleanup.yml index e19d903e6b..cc74b70afc 100644 --- a/tests/integration/targets/setup_remote_tmp_dir_outside_tmp/tasks/default-cleanup.yml +++ b/tests/integration/targets/setup_remote_tmp_dir_outside_tmp/tasks/default-cleanup.yml @@ -7,4 +7,4 @@ file: path: "{{ remote_tmp_dir }}" state: absent - no_log: yes + no_log: true diff --git a/tests/integration/targets/setup_wildfly_server/handlers/main.yml b/tests/integration/targets/setup_wildfly_server/handlers/main.yml index 641025edb1..1383b15753 100644 --- a/tests/integration/targets/setup_wildfly_server/handlers/main.yml +++ b/tests/integration/targets/setup_wildfly_server/handlers/main.yml @@ -7,7 +7,7 @@ systemd: name: wildfly state: stopped - ignore_errors: yes + ignore_errors: true - name: Remove files file: diff --git a/tests/integration/targets/setup_wildfly_server/tasks/main.yml b/tests/integration/targets/setup_wildfly_server/tasks/main.yml index e2bda5736e..26f5083b0a 100644 --- a/tests/integration/targets/setup_wildfly_server/tasks/main.yml +++ b/tests/integration/targets/setup_wildfly_server/tasks/main.yml @@ -31,7 +31,7 @@ unarchive: src: '{{ wf_tmp_dir }}/wildfly-{{ wf_version }}.tar.gz' dest: '{{ wf_tmp_dir }}' - remote_src: yes + remote_src: true - name: Remove tar file: @@ -47,12 +47,12 @@ - name: Create group for wildfly group: name: '{{ wf_user }}' - system: yes + system: true - name: Create user for wildfly user: name: '{{ wf_user }}' - system: yes + system: true group: '{{ wf_user }}' home: '{{ wf_homedir }}' @@ -62,7 +62,7 @@ state: directory owner: '{{ wf_user }}' group: '{{ wf_user }}' - recurse: yes + recurse: true - name: Create config file copy: @@ -86,11 +86,11 @@ mode: "0644" - name: Create directories for testing the default deploy_path - become: yes + become: true file: path: '{{ default_deploy_root }}' state: directory - recurse: yes + recurse: true owner: '{{ wf_user }}' group: '{{ wf_user }}' @@ -102,6 +102,6 @@ - name: Reload systemd and start wildfly systemd: - daemon_reload: yes + daemon_reload: true name: wildfly state: started diff --git a/tests/integration/targets/shutdown/tasks/main.yml b/tests/integration/targets/shutdown/tasks/main.yml index 3f765ff059..dadeb62699 100644 --- a/tests/integration/targets/shutdown/tasks/main.yml +++ b/tests/integration/targets/shutdown/tasks/main.yml @@ -20,13 +20,13 @@ delay: 100 msg: "Custom Message" register: shutdown_result - check_mode: yes + check_mode: true - name: Execute shutdown with minus delay community.general.shutdown: delay: -100 register: shutdown_result_minus - check_mode: yes + check_mode: true - name: Verify Custom Message except Alpine, AIX assert: diff --git a/tests/integration/targets/ssh_config/tasks/main.yml b/tests/integration/targets/ssh_config/tasks/main.yml index d0b088302c..d594835bf1 100644 --- a/tests/integration/targets/ssh_config/tasks/main.yml +++ b/tests/integration/targets/ssh_config/tasks/main.yml @@ -36,7 +36,7 @@ - name: Fail for required argument community.general.ssh_config: ssh_config_file: "{{ ssh_config_test }}" - ignore_errors: yes + ignore_errors: true register: host_required - name: Check if ssh_config fails for required parameter host @@ -53,7 +53,7 @@ port: '2223' state: present register: host_add - check_mode: yes + check_mode: true - name: Check if changes are made in check mode assert: @@ -179,7 +179,7 @@ port: '2223' state: present register: mut_ex - ignore_errors: yes + ignore_errors: true - name: Check mutual exclusive test - user and ssh_config_file assert: diff --git a/tests/integration/targets/ssh_config/tasks/options.yml b/tests/integration/targets/ssh_config/tasks/options.yml index 65ce691cf8..9b617ad356 100644 --- a/tests/integration/targets/ssh_config/tasks/options.yml +++ b/tests/integration/targets/ssh_config/tasks/options.yml @@ -18,7 +18,7 @@ host_key_algorithms: "+ssh-rsa" state: present register: options_add - check_mode: yes + check_mode: true - name: Options - Check if changes are made in check mode assert: @@ -91,7 +91,7 @@ ssh_config_file: "{{ ssh_config_test }}" host: "options.example.com" proxycommand: "ssh new-jumphost.example.com -W %h:%p" - forward_agent: no + forward_agent: false host_key_algorithms: "+ssh-ed25519" state: present register: options_update @@ -111,7 +111,7 @@ ssh_config_file: "{{ ssh_config_test }}" host: "options.example.com" proxycommand: "ssh new-jumphost.example.com -W %h:%p" - forward_agent: no + forward_agent: false host_key_algorithms: "+ssh-ed25519" state: present register: options_update diff --git a/tests/integration/targets/supervisorctl/tasks/install_Linux.yml b/tests/integration/targets/supervisorctl/tasks/install_Linux.yml index e5a7b009e0..2f70b284cc 100644 --- a/tests/integration/targets/supervisorctl/tasks/install_Linux.yml +++ b/tests/integration/targets/supervisorctl/tasks/install_Linux.yml @@ -12,4 +12,4 @@ service: name: '{{ supervisor_service_name }}' state: stopped - enabled: no + enabled: false diff --git a/tests/integration/targets/sysrc/tasks/main.yml b/tests/integration/targets/sysrc/tasks/main.yml index 544dc63c65..df24cf1f94 100644 --- a/tests/integration/targets/sysrc/tasks/main.yml +++ b/tests/integration/targets/sysrc/tasks/main.yml @@ -29,7 +29,7 @@ sysrc: name: mysql_pidfile value: checkmode - check_mode: yes + check_mode: true register: sysrc_example1_checkmode - name: Configure mysql pid file (idempotent) @@ -68,7 +68,7 @@ state: present value: "NO" path: /boot/loader.conf - check_mode: yes + check_mode: true register: sysrc_example2_checkmode - name: Enable accf_http kld in /boot/loader.conf (idempotent) @@ -112,7 +112,7 @@ name: cloned_interfaces state: value_present value: "gif1" - check_mode: yes + check_mode: true register: sysrc_example3_checkmode - name: Add gif0 interface (idempotent) @@ -159,7 +159,7 @@ name: nginx_enable value: "NO" jail: testjail - check_mode: yes + check_mode: true register: sysrc_example4_checkmode - name: Enable nginx in test jail (idempotent) @@ -198,7 +198,7 @@ sysrc: name: sysrc_absent state: absent - check_mode: yes + check_mode: true register: sysrc_absent_checkmode - name: Remove sysrc_absent @@ -255,7 +255,7 @@ state: value_present delim: "," value: t4 - check_mode: yes + check_mode: true register: sysrc_delim_checkmode - name: Add to value with delimiter (idempotent) @@ -305,7 +305,7 @@ state: value_absent value: t2 delim: "," - check_mode: yes + check_mode: true register: sysrc_value_absent_checkmode - name: Remove value from sysrc_delim (idempotent diff --git a/tests/integration/targets/sysrc/tasks/setup-testjail.yml b/tests/integration/targets/sysrc/tasks/setup-testjail.yml index 4ad0d63b16..8aac7a430d 100644 --- a/tests/integration/targets/sysrc/tasks/setup-testjail.yml +++ b/tests/integration/targets/sysrc/tasks/setup-testjail.yml @@ -36,11 +36,11 @@ line: ezjail_ftphost=http://ftp-archive.freebsd.org - name: Start ezjail - ignore_errors: yes + ignore_errors: true service: name: ezjail state: started - enabled: yes + enabled: true - name: Has ezjail register: ezjail_base_jail diff --git a/tests/integration/targets/terraform/tasks/complex_variables.yml b/tests/integration/targets/terraform/tasks/complex_variables.yml index 180a1fb98c..9788a3eed1 100644 --- a/tests/integration/targets/terraform/tasks/complex_variables.yml +++ b/tests/integration/targets/terraform/tasks/complex_variables.yml @@ -23,7 +23,7 @@ community.general.terraform: project_path: "{{ terraform_project_dir }}/complex_vars" binary_path: "{{ terraform_binary_path }}" - force_init: yes + force_init: true complex_vars: true variables: dictionaries: diff --git a/tests/integration/targets/terraform/tasks/main.yml b/tests/integration/targets/terraform/tasks/main.yml index db9fc3fc5b..1c66990be2 100644 --- a/tests/integration/targets/terraform/tasks/main.yml +++ b/tests/integration/targets/terraform/tasks/main.yml @@ -43,7 +43,7 @@ src: "{{ terraform_url }}" dest: "{{ remote_tmp_dir }}" mode: 0755 - remote_src: yes + remote_src: true validate_certs: "{{ validate_certs }}" when: terraform_version_installed is not defined or terraform_version_installed != terraform_version diff --git a/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml b/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml index 711dfc1a33..b20182c9f3 100644 --- a/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml +++ b/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml @@ -16,7 +16,7 @@ ansible.builtin.template: src: templates/provider_test/main.tf.j2 dest: "{{ terraform_project_dir }}/{{ tf_provider['name'] }}/main.tf" - force: yes + force: true register: terraform_provider_hcl # The purpose of this task is to init terraform multiple times with different provider module @@ -26,7 +26,7 @@ community.general.terraform: project_path: "{{ terraform_provider_hcl.dest | dirname }}" binary_path: "{{ terraform_binary_path }}" - force_init: yes + force_init: true provider_upgrade: "{{ terraform_provider_upgrade }}" state: present register: terraform_init_result diff --git a/tests/integration/targets/terraform/vars/main.yml b/tests/integration/targets/terraform/vars/main.yml index 7474836387..1032adee4f 100644 --- a/tests/integration/targets/terraform/vars/main.yml +++ b/tests/integration/targets/terraform/vars/main.yml @@ -14,13 +14,13 @@ terraform_arch: "{{ ansible_system | lower }}_{{terraform_arch_map[ansible_archi terraform_url: "https://releases.hashicorp.com/terraform/{{ terraform_version }}/terraform_{{ terraform_version }}_{{ terraform_arch }}.zip" # Controls whether the unarchive task will validate TLS certs of the Terraform binary host -validate_certs: yes +validate_certs: true # Directory where Terraform tests will be created terraform_project_dir: "{{ remote_tmp_dir }}/tf_provider_test" # Controls whether terraform init will use the `-upgrade` flag -terraform_provider_upgrade: yes +terraform_provider_upgrade: true # list of dicts containing Terraform providers that will be tested # The null provider is a good candidate, as it's small and has no external dependencies diff --git a/tests/integration/targets/timezone/tasks/test.yml b/tests/integration/targets/timezone/tasks/test.yml index 5a58559d7c..975526800e 100644 --- a/tests/integration/targets/timezone/tasks/test.yml +++ b/tests/integration/targets/timezone/tasks/test.yml @@ -10,7 +10,7 @@ - name: set timezone to Australia/Brisbane (checkmode) timezone: name: Australia/Brisbane - check_mode: yes + check_mode: true register: timezone_set_checkmode - name: ensure timezone reported as changed in checkmode @@ -24,7 +24,7 @@ command: cmp /etc/localtime /usr/share/zoneinfo/Australia/Brisbane register: result failed_when: result is not failed - changed_when: no + changed_when: false - name: ensure that checkmode didn't update the timezone in the config file command: egrep '^(TIME)?ZONE="Etc/UTC"' {{ timezone_config_file }} @@ -52,7 +52,7 @@ - name: ensure that the timezone is actually set command: cmp /etc/localtime /usr/share/zoneinfo/Australia/Brisbane - changed_when: no + changed_when: false - name: ensure that the timezone is updated in the config file command: egrep '^(TIME)?ZONE="Australia/Brisbane"' {{ timezone_config_file }} @@ -93,14 +93,14 @@ - name: check dpkg-reconfigure shell: type dpkg-reconfigure register: check_dpkg_reconfigure - ignore_errors: yes - changed_when: no + ignore_errors: true + changed_when: false - name: check timedatectl shell: type timedatectl && timedatectl register: check_timedatectl - ignore_errors: yes - changed_when: no + ignore_errors: true + changed_when: false - block: - name: set timezone to Etc/UTC @@ -161,7 +161,7 @@ - name: check if the timezone is actually set (empty config file) command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no + changed_when: false ## @@ -187,7 +187,7 @@ - name: check if the timezone is actually set (no config file) command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no + changed_when: false ## @@ -199,7 +199,7 @@ src: /usr/share/zoneinfo/Etc/UTC dest: /etc/localtime state: link - force: yes + force: true - name: set timezone to Europe/Belgrade (over symlink) timezone: @@ -215,7 +215,7 @@ - name: check if the timezone is actually set (over symlink) command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no + changed_when: false ## @@ -227,7 +227,7 @@ src: /tmp/foo dest: /etc/localtime state: link - force: yes + force: true - name: set timezone to Europe/Belgrade (over broken symlink) timezone: @@ -243,7 +243,7 @@ - name: check if the timezone is actually set (over broken symlink) command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no + changed_when: false ## @@ -254,7 +254,7 @@ copy: src: /usr/share/zoneinfo/Etc/UTC dest: /etc/localtime - remote_src: yes + remote_src: true - name: set timezone to Europe/Belgrade (over copied file) timezone: @@ -270,7 +270,7 @@ - name: check if the timezone is actually set (over copied file) command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no + changed_when: false when: - ansible_service_mgr != 'systemd' - timezone_config_file is defined @@ -283,12 +283,12 @@ - name: check if hwclock is supported in the environment command: hwclock --test register: hwclock_test - ignore_errors: yes + ignore_errors: true - name: check if timedatectl works in the environment command: timedatectl register: timedatectl_test - ignore_errors: yes + ignore_errors: true - name: set_fact: @@ -305,7 +305,7 @@ - name: set hwclock to UTC (checkmode) timezone: hwclock: UTC - check_mode: yes + check_mode: true register: hwclock_set_checkmode - name: ensure hwclock reported as changed (checkmode) @@ -358,7 +358,7 @@ - name: set hwclock to RTC again (checkmode) timezone: hwclock: UTC - check_mode: yes + check_mode: true register: hwclock_again_checkmode - name: set hwclock idempotency (checkmode) @@ -510,7 +510,7 @@ timezone: name: Europe/Belgrade hwclock: UTC - check_mode: yes + check_mode: true register: tzclock_set_checkmode - name: ensure timezone and hwclock reported as changed in checkmode @@ -526,7 +526,7 @@ command: cmp /etc/localtime /usr/share/zoneinfo/Australia/Brisbane register: result failed_when: result is not failed - changed_when: no + changed_when: false - block: - name: ensure that checkmode didn't update the timezone in the config file @@ -565,7 +565,7 @@ - name: ensure that the timezone is actually set command: cmp /etc/localtime /usr/share/zoneinfo/Europe/Belgrade - changed_when: no + changed_when: false - block: - name: ensure that the timezone is updated in the config file diff --git a/tests/integration/targets/ufw/tasks/main.yml b/tests/integration/targets/ufw/tasks/main.yml index c870f85d47..5fba2fa4d7 100644 --- a/tests/integration/targets/ufw/tasks/main.yml +++ b/tests/integration/targets/ufw/tasks/main.yml @@ -18,10 +18,10 @@ - name: Install iptables (SuSE only) package: name: iptables - become: yes + become: true when: ansible_os_family == 'Suse' - name: Install ufw - become: yes + become: true package: name: ufw @@ -30,7 +30,7 @@ - include_tasks: run-test.yml with_fileglob: - "tests/*.yml" - become: yes + become: true # Cleanup always: diff --git a/tests/integration/targets/ufw/tasks/tests/basic.yml b/tests/integration/targets/ufw/tasks/tests/basic.yml index 9aac5e6dd8..8c179d7aed 100644 --- a/tests/integration/targets/ufw/tasks/tests/basic.yml +++ b/tests/integration/targets/ufw/tasks/tests/basic.yml @@ -10,7 +10,7 @@ - name: Enable (check mode) ufw: state: enabled - check_mode: yes + check_mode: true register: enable_check - name: Enable ufw: @@ -23,7 +23,7 @@ - name: Enable (idempotency, check mode) ufw: state: enabled - check_mode: yes + check_mode: true register: enable_idem_check - assert: that: @@ -38,7 +38,7 @@ rule: allow port: 23 to_ip: 0.0.0.0 - check_mode: yes + check_mode: true register: ipv4_allow_check - name: ipv4 allow ufw: @@ -57,7 +57,7 @@ rule: allow port: 23 to_ip: 0.0.0.0 - check_mode: yes + check_mode: true register: ipv4_allow_idem_check - assert: that: @@ -72,30 +72,30 @@ rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv4_allow_check - name: delete ipv4 allow ufw: rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes + delete: true register: delete_ipv4_allow - name: delete ipv4 allow (idempotency) ufw: rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes + delete: true register: delete_ipv4_allow_idem - name: delete ipv4 allow (idempotency, check mode) ufw: rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv4_allow_idem_check - assert: that: @@ -110,7 +110,7 @@ rule: allow port: 23 to_ip: "::" - check_mode: yes + check_mode: true register: ipv6_allow_check - name: ipv6 allow ufw: @@ -129,7 +129,7 @@ rule: allow port: 23 to_ip: "::" - check_mode: yes + check_mode: true register: ipv6_allow_idem_check - assert: that: @@ -144,30 +144,30 @@ rule: allow port: 23 to_ip: "::" - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv6_allow_check - name: delete ipv6 allow ufw: rule: allow port: 23 to_ip: "::" - delete: yes + delete: true register: delete_ipv6_allow - name: delete ipv6 allow (idempotency) ufw: rule: allow port: 23 to_ip: "::" - delete: yes + delete: true register: delete_ipv6_allow_idem - name: delete ipv6 allow (idempotency, check mode) ufw: rule: allow port: 23 to_ip: "::" - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv6_allow_idem_check - assert: that: @@ -183,7 +183,7 @@ rule: allow port: 23 to_ip: 0.0.0.0 - check_mode: yes + check_mode: true register: ipv4_allow_check - name: ipv4 allow ufw: @@ -202,7 +202,7 @@ rule: allow port: 23 to_ip: 0.0.0.0 - check_mode: yes + check_mode: true register: ipv4_allow_idem_check - assert: that: @@ -217,30 +217,30 @@ rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv4_allow_check - name: delete ipv4 allow ufw: rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes + delete: true register: delete_ipv4_allow - name: delete ipv4 allow (idempotency) ufw: rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes + delete: true register: delete_ipv4_allow_idem - name: delete ipv4 allow (idempotency, check mode) ufw: rule: allow port: 23 to_ip: 0.0.0.0 - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv4_allow_idem_check - assert: that: @@ -255,7 +255,7 @@ rule: allow port: 23 to_ip: "::" - check_mode: yes + check_mode: true register: ipv6_allow_check - name: ipv6 allow ufw: @@ -274,7 +274,7 @@ rule: allow port: 23 to_ip: "::" - check_mode: yes + check_mode: true register: ipv6_allow_idem_check - assert: that: @@ -289,30 +289,30 @@ rule: allow port: 23 to_ip: "::" - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv6_allow_check - name: delete ipv6 allow ufw: rule: allow port: 23 to_ip: "::" - delete: yes + delete: true register: delete_ipv6_allow - name: delete ipv6 allow (idempotency) ufw: rule: allow port: 23 to_ip: "::" - delete: yes + delete: true register: delete_ipv6_allow_idem - name: delete ipv6 allow (idempotency, check mode) ufw: rule: allow port: 23 to_ip: "::" - delete: yes - check_mode: yes + delete: true + check_mode: true register: delete_ipv6_allow_idem_check - assert: that: @@ -329,7 +329,7 @@ - name: Reload ufw (check mode) ufw: state: reloaded - check_mode: yes + check_mode: true register: reload_check - assert: that: @@ -340,7 +340,7 @@ - name: Disable (check mode) ufw: state: disabled - check_mode: yes + check_mode: true register: disable_check - name: Disable ufw: @@ -353,7 +353,7 @@ - name: Disable (idempotency, check mode) ufw: state: disabled - check_mode: yes + check_mode: true register: disable_idem_check - assert: that: @@ -369,7 +369,7 @@ - name: Reset (check mode) ufw: state: reset - check_mode: yes + check_mode: true register: reset_check - pause: # Should not be needed, but since ufw is ignoring --dry-run for reset @@ -396,7 +396,7 @@ - name: Reset (idempotency, check mode) ufw: state: reset - check_mode: yes + check_mode: true register: reset_idem_check - assert: that: diff --git a/tests/integration/targets/ufw/tasks/tests/global-state.yml b/tests/integration/targets/ufw/tasks/tests/global-state.yml index 3e8ab4460e..f5f1007510 100644 --- a/tests/integration/targets/ufw/tasks/tests/global-state.yml +++ b/tests/integration/targets/ufw/tasks/tests/global-state.yml @@ -10,15 +10,15 @@ # ############################################ - name: Make sure logging is off ufw: - logging: no + logging: false - name: Logging (check mode) ufw: - logging: yes - check_mode: yes + logging: true + check_mode: true register: logging_check - name: Logging ufw: - logging: yes + logging: true register: logging - name: Get logging shell: | @@ -28,17 +28,17 @@ LC_ALL: C - name: Logging (idempotency) ufw: - logging: yes + logging: true register: logging_idem - name: Logging (idempotency, check mode) ufw: - logging: yes - check_mode: yes + logging: true + check_mode: true register: logging_idem_check - name: Logging (change, check mode) ufw: logging: full - check_mode: yes + check_mode: true register: logging_change_check - name: Logging (change) ufw: @@ -66,7 +66,7 @@ ufw: default: reject direction: incoming - check_mode: yes + check_mode: true register: default_check - name: Default ufw: @@ -88,13 +88,13 @@ ufw: default: reject direction: incoming - check_mode: yes + check_mode: true register: default_idem_check - name: Default (change, check mode) ufw: default: allow direction: incoming - check_mode: yes + check_mode: true register: default_change_check - name: Default (change) ufw: @@ -115,7 +115,7 @@ - name: Default (change incoming implicitly, check mode) ufw: default: allow - check_mode: yes + check_mode: true register: default_change_implicit_check - name: Default (change incoming implicitly) ufw: @@ -130,7 +130,7 @@ - name: Default (change incoming implicitly, idempotent, check mode) ufw: default: allow - check_mode: yes + check_mode: true register: default_change_implicit_idem_check - name: Default (change incoming implicitly, idempotent) ufw: diff --git a/tests/integration/targets/ufw/tasks/tests/interface.yml b/tests/integration/targets/ufw/tasks/tests/interface.yml index 9c7c570dc7..1ec3568aa2 100644 --- a/tests/integration/targets/ufw/tasks/tests/interface.yml +++ b/tests/integration/targets/ufw/tasks/tests/interface.yml @@ -10,7 +10,7 @@ - name: Route with interface in and out ufw: rule: allow - route: yes + route: true interface_in: foo interface_out: bar proto: tcp @@ -22,7 +22,7 @@ - name: Route with interface in ufw: rule: allow - route: yes + route: true interface_in: foo proto: tcp from_ip: 1.1.1.1 @@ -31,7 +31,7 @@ - name: Route with interface out ufw: rule: allow - route: yes + route: true interface_out: bar proto: tcp from_ip: 1.1.1.1 @@ -77,7 +77,7 @@ from_port: 1111 to_ip: 8.8.8.8 to_port: 2222 - ignore_errors: yes + ignore_errors: true register: ufw_non_route_iface - assert: diff --git a/tests/integration/targets/wakeonlan/tasks/main.yml b/tests/integration/targets/wakeonlan/tasks/main.yml index 03df57e989..0597480318 100644 --- a/tests/integration/targets/wakeonlan/tasks/main.yml +++ b/tests/integration/targets/wakeonlan/tasks/main.yml @@ -22,7 +22,7 @@ wakeonlan: mac: 00-00-5E-00-53-66-AB port: 9 - ignore_errors: yes + ignore_errors: true register: incorrect_mac_length - name: Check error message @@ -35,7 +35,7 @@ wakeonlan: mac: ZW-YX-WV-UT-SR-QP port: 9 - ignore_errors: yes + ignore_errors: true register: incorrect_mac_format - name: Check error message @@ -48,7 +48,7 @@ wakeonlan: mac: 00-00-5E-00-53-66 broadcast: 345.567.678.890 - ignore_errors: yes + ignore_errors: true register: incorrect_broadcast_address - name: Check error message diff --git a/tests/integration/targets/xattr/tasks/main.yml b/tests/integration/targets/xattr/tasks/main.yml index b5293db770..b6e93d92bc 100644 --- a/tests/integration/targets/xattr/tasks/main.yml +++ b/tests/integration/targets/xattr/tasks/main.yml @@ -13,7 +13,7 @@ - name: Check availability of xattr support command: setfattr -n user.foo {{ test_file }} - ignore_errors: yes + ignore_errors: true register: xattr - name: Test diff --git a/tests/integration/targets/xfs_quota/tasks/main.yml b/tests/integration/targets/xfs_quota/tasks/main.yml index e98b1452ab..b1ad1da4e9 100644 --- a/tests/integration/targets/xfs_quota/tasks/main.yml +++ b/tests/integration/targets/xfs_quota/tasks/main.yml @@ -13,7 +13,7 @@ user: name: xfsquotauser state: present - become: yes + become: true - include_tasks: uquota.yml - include_tasks: gquota.yml @@ -24,4 +24,4 @@ user: name: xfsquotauser state: absent - become: yes + become: true diff --git a/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml b/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml index fbc74a9367..e15ac5fd92 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml @@ -24,8 +24,8 @@ copy: src: results/test-add-children-elements-unicode.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-add-children-elements.yml b/tests/integration/targets/xml/tasks/test-add-children-elements.yml index 7b5e0be42a..29467f6d6f 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-elements.yml @@ -24,8 +24,8 @@ copy: src: results/test-add-children-elements.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml b/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml index f6733d6e82..2b232b6d0d 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml @@ -23,8 +23,8 @@ copy: src: results/test-add-children-from-groupvars.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml b/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml index fbeff105b2..7795c89663 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml @@ -13,20 +13,20 @@ xml: path: /tmp/ansible-xml-beers.xml xpath: '/business/beers/beer[text()="St. Bernardus Abbot 12"]' - insertafter: yes + insertafter: true add_children: - beer: Old Rasputin - beer: Old Motor Oil - beer: Old Curmudgeon - pretty_print: yes + pretty_print: true register: add_children_insertafter - name: Compare to expected result copy: src: results/test-add-children-insertafter.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml b/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml index 3c3212c30e..b14c5e06fc 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml @@ -13,20 +13,20 @@ xml: path: /tmp/ansible-xml-beers.xml xpath: '/business/beers/beer[text()="St. Bernardus Abbot 12"]' - insertbefore: yes + insertbefore: true add_children: - beer: Old Rasputin - beer: Old Motor Oil - beer: Old Curmudgeon - pretty_print: yes + pretty_print: true register: add_children_insertbefore - name: Compare to expected result copy: src: results/test-add-children-insertbefore.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml b/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml index 7c928b239d..07905aa15c 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml @@ -26,8 +26,8 @@ copy: src: results/test-add-children-with-attributes-unicode.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml b/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml index e11dda7639..fede24395f 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml @@ -26,8 +26,8 @@ copy: src: results/test-add-children-with-attributes.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison # NOTE: This test may fail if lxml does not support predictable element attribute order diff --git a/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml b/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml index e3ed8080f7..b1718e452e 100644 --- a/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml +++ b/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml @@ -57,28 +57,28 @@ file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/testnormalelement value: xml tag with no special characters - pretty_print: yes + pretty_print: true - name: Add an element with dash xml: file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/test-with-dash value: xml tag with dashes - pretty_print: yes + pretty_print: true - name: Add an element with dot xml: file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/test-with-dash.and.dot value: xml tag with dashes and dots - pretty_print: yes + pretty_print: true - name: Add an element with underscore xml: file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/test-with.dash_and.dot_and-underscores value: xml tag with dashes, dots and underscores - pretty_print: yes + pretty_print: true - name: Add an attribute on a conditional element xml: @@ -99,14 +99,14 @@ - name: Pretty Print this! xml: file: /tmp/ansible-xml-beers-implicit.xml - pretty_print: yes + pretty_print: true - name: Compare to expected result copy: src: results/test-add-element-implicitly.xml dest: /tmp/ansible-xml-beers-implicit.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result @@ -203,7 +203,7 @@ file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/testnormalelement value: xml tag with no special characters - pretty_print: yes + pretty_print: true namespaces: a: http://example.com/some/namespace @@ -213,7 +213,7 @@ file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/test-with-dash value: xml tag with dashes - pretty_print: yes + pretty_print: true namespaces: a: http://example.com/some/namespace @@ -222,7 +222,7 @@ file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/test-with-dash.and.dot value: xml tag with dashes and dots - pretty_print: yes + pretty_print: true namespaces: a: http://example.com/some/namespace @@ -231,11 +231,11 @@ file: /tmp/ansible-xml-beers-implicit.xml xpath: /business/test-with.dash_and.dot_and-underscores value: xml tag with dashes, dots and underscores - pretty_print: yes + pretty_print: true namespaces: a: http://example.com/some/namespace - name: Pretty Print this! xml: file: /tmp/ansible-xml-beers-implicit.xml - pretty_print: yes + pretty_print: true diff --git a/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml b/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml index dd3ada48e1..2a9daab787 100644 --- a/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml @@ -27,8 +27,8 @@ copy: src: results/test-add-namespaced-children-elements.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-children-elements-xml.yml b/tests/integration/targets/xml/tasks/test-children-elements-xml.yml index 139281fb34..1c8c2b804d 100644 --- a/tests/integration/targets/xml/tasks/test-children-elements-xml.yml +++ b/tests/integration/targets/xml/tasks/test-children-elements-xml.yml @@ -25,8 +25,8 @@ copy: src: results/test-add-children-elements.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-count-unicode.yml b/tests/integration/targets/xml/tasks/test-count-unicode.yml index 58d01b8318..118e2986db 100644 --- a/tests/integration/targets/xml/tasks/test-count-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-count-unicode.yml @@ -13,7 +13,7 @@ xml: path: /tmp/ansible-xml-beers-unicode.xml xpath: /business/beers/beer - count: yes + count: true register: beers - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-count.yml b/tests/integration/targets/xml/tasks/test-count.yml index cc778ddcd6..79be9402fe 100644 --- a/tests/integration/targets/xml/tasks/test-count.yml +++ b/tests/integration/targets/xml/tasks/test-count.yml @@ -13,7 +13,7 @@ xml: path: /tmp/ansible-xml-beers.xml xpath: /business/beers/beer - count: yes + count: true register: beers - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml b/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml index 0eb92fe083..33f129e2e6 100644 --- a/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml +++ b/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml @@ -17,7 +17,7 @@ - child02 value: conflict! register: module_output - ignore_errors: yes + ignore_errors: true - name: Test expected result assert: diff --git a/tests/integration/targets/xml/tasks/test-pretty-print-only.yml b/tests/integration/targets/xml/tasks/test-pretty-print-only.yml index 0657186ca5..03d3299aa7 100644 --- a/tests/integration/targets/xml/tasks/test-pretty-print-only.yml +++ b/tests/integration/targets/xml/tasks/test-pretty-print-only.yml @@ -14,15 +14,15 @@ - name: Pretty print without modification xml: path: /tmp/ansible-xml-beers.xml - pretty_print: yes + pretty_print: true register: pretty_print_only - name: Compare to expected result copy: src: results/test-pretty-print-only.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-pretty-print.yml b/tests/integration/targets/xml/tasks/test-pretty-print.yml index 2ef0a0ce8b..51b34502d5 100644 --- a/tests/integration/targets/xml/tasks/test-pretty-print.yml +++ b/tests/integration/targets/xml/tasks/test-pretty-print.yml @@ -13,7 +13,7 @@ xml: path: /tmp/ansible-xml-beers.xml xpath: /business/beers - pretty_print: yes + pretty_print: true add_children: - beer: Old Rasputin register: pretty_print @@ -22,8 +22,8 @@ copy: src: results/test-pretty-print.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml index 97bc7f525a..3222bd4368 100644 --- a/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml @@ -20,8 +20,8 @@ copy: src: results/test-remove-attribute.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-attribute.yml b/tests/integration/targets/xml/tasks/test-remove-attribute.yml index 84e15aa446..e8952a655e 100644 --- a/tests/integration/targets/xml/tasks/test-remove-attribute.yml +++ b/tests/integration/targets/xml/tasks/test-remove-attribute.yml @@ -23,8 +23,8 @@ copy: src: results/test-remove-attribute.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml index ada95029e8..c1312c5a75 100644 --- a/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml @@ -20,8 +20,8 @@ copy: src: results/test-remove-element.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-element.yml b/tests/integration/targets/xml/tasks/test-remove-element.yml index 243e148984..bea376ba93 100644 --- a/tests/integration/targets/xml/tasks/test-remove-element.yml +++ b/tests/integration/targets/xml/tasks/test-remove-element.yml @@ -23,8 +23,8 @@ copy: src: results/test-remove-element.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml index 80dc6fee42..61b7179ba0 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml @@ -25,8 +25,8 @@ copy: src: results/test-remove-namespaced-attribute.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml index 75c1a505d9..a725ee79cf 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml @@ -28,8 +28,8 @@ copy: src: results/test-remove-namespaced-attribute.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml index 5bbb9ef7c7..fd83c54c32 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml @@ -25,8 +25,8 @@ copy: src: results/test-remove-element.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml index 70a86dcd30..c4129f33e2 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml @@ -28,8 +28,8 @@ copy: src: results/test-remove-element.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml b/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml index 27e759c6b8..bf35bfdd95 100644 --- a/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml @@ -24,8 +24,8 @@ copy: src: results/test-set-attribute-value-unicode.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-attribute-value.yml b/tests/integration/targets/xml/tasks/test-set-attribute-value.yml index ada4d9ab56..2908e00aa3 100644 --- a/tests/integration/targets/xml/tasks/test-set-attribute-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-attribute-value.yml @@ -24,8 +24,8 @@ copy: src: results/test-set-attribute-value.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml index 7fb755bfcc..648f5b25af 100644 --- a/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml +++ b/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml @@ -47,8 +47,8 @@ copy: src: results/test-set-children-elements-level.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result @@ -70,8 +70,8 @@ copy: src: results/test-set-children-elements-level.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml index 5e3a7a5758..8c4fc10941 100644 --- a/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml @@ -25,8 +25,8 @@ copy: src: results/test-set-children-elements-unicode.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result @@ -41,8 +41,8 @@ copy: src: results/test-set-children-elements-unicode.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements.yml b/tests/integration/targets/xml/tasks/test-set-children-elements.yml index 147f493c97..ed9e4a54ee 100644 --- a/tests/integration/targets/xml/tasks/test-set-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-set-children-elements.yml @@ -19,8 +19,8 @@ copy: src: results/test-set-children-elements-empty-list.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result @@ -51,8 +51,8 @@ copy: src: results/test-set-children-elements.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result @@ -74,8 +74,8 @@ copy: src: results/test-set-children-elements.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml b/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml index 49a4903ad0..4041bf9106 100644 --- a/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml +++ b/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml @@ -23,8 +23,8 @@ copy: src: results/test-set-element-value-empty.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml b/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml index 9dbb47b94b..616f26ddc8 100644 --- a/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml @@ -37,8 +37,8 @@ copy: src: results/test-set-element-value-unicode.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-element-value.yml b/tests/integration/targets/xml/tasks/test-set-element-value.yml index 50bbe71f95..b563b25766 100644 --- a/tests/integration/targets/xml/tasks/test-set-element-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-element-value.yml @@ -37,8 +37,8 @@ copy: src: results/test-set-element-value.xml dest: /tmp/ansible-xml-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml index 90a9aef725..7c1bbd2376 100644 --- a/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml @@ -29,8 +29,8 @@ copy: src: results/test-set-namespaced-attribute-value.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml index 72d342c514..e6ed1bdecc 100644 --- a/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml @@ -23,7 +23,7 @@ copy: src: /tmp/ansible-xml-namespaced-beers.xml dest: /tmp/ansible-xml-namespaced-beers-1.xml - remote_src: yes + remote_src: true - name: Set child elements again xml: @@ -41,15 +41,15 @@ copy: src: /tmp/ansible-xml-namespaced-beers.xml dest: /tmp/ansible-xml-namespaced-beers-2.xml - remote_src: yes + remote_src: true - name: Compare to expected result copy: src: /tmp/ansible-xml-namespaced-beers-1.xml dest: /tmp/ansible-xml-namespaced-beers-2.xml - remote_src: yes - check_mode: yes - diff: yes + remote_src: true + check_mode: true + diff: true register: comparison #command: diff /tmp/ansible-xml-namespaced-beers-1.xml /tmp/ansible-xml-namespaced-beers-2.xml diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml index 7b3839a2b3..9944da8a55 100644 --- a/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml @@ -40,8 +40,8 @@ copy: src: results/test-set-namespaced-element-value.xml dest: /tmp/ansible-xml-namespaced-beers.xml - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison #command: diff -u {{ role_path }}/results/test-set-namespaced-element-value.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-xmlstring.yml b/tests/integration/targets/xml/tasks/test-xmlstring.yml index 4a0e4ad343..1c2e4de4a8 100644 --- a/tests/integration/targets/xml/tasks/test-xmlstring.yml +++ b/tests/integration/targets/xml/tasks/test-xmlstring.yml @@ -22,8 +22,8 @@ copy: content: "{{ xmlresponse.xmlstring }}\n" dest: '/tmp/test-pretty-print-only.xml' - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison - name: Test expected result @@ -38,15 +38,15 @@ - name: Read from xmlstring (using pretty_print) xml: xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}" - pretty_print: yes + pretty_print: true register: xmlresponse - name: Compare to expected result copy: content: '{{ xmlresponse.xmlstring }}' dest: '/tmp/test-pretty-print-only.xml' - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison # FIXME: This change is related to the newline added by pretty_print @@ -63,7 +63,7 @@ xml: xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}" xpath: /business/beers - pretty_print: yes + pretty_print: true add_children: - beer: Old Rasputin register: xmlresponse_modification @@ -72,8 +72,8 @@ copy: content: '{{ xmlresponse_modification.xmlstring }}' dest: '/tmp/test-pretty-print.xml' - check_mode: yes - diff: yes + check_mode: true + diff: true register: comparison # FIXME: This change is related to the newline added by pretty_print diff --git a/tests/integration/targets/yarn/tasks/run.yml b/tests/integration/targets/yarn/tasks/run.yml index 6521d45fcf..93a3d5bb55 100644 --- a/tests/integration/targets/yarn/tasks/run.yml +++ b/tests/integration/targets/yarn/tasks/run.yml @@ -12,14 +12,14 @@ unarchive: src: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/yarn/{{ nodejs_path }}.tar.gz' dest: '{{ remote_tmp_dir }}' - remote_src: yes + remote_src: true creates: '{{ remote_tmp_dir }}/{{ nodejs_path }}.tar.gz' - name: 'Download Yarn' unarchive: src: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/yarn/yarn-v{{yarn_version}}.tar.gz' dest: '{{ remote_tmp_dir }}' - remote_src: yes + remote_src: true creates: '{{ remote_tmp_dir }}/yarn-v{{yarn_version}}_pkg.tar.gz' - name: 'Copy node to directory created earlier' diff --git a/tests/integration/targets/yum_versionlock/tasks/main.yml b/tests/integration/targets/yum_versionlock/tasks/main.yml index d1d6726247..05f1f74954 100644 --- a/tests/integration/targets/yum_versionlock/tasks/main.yml +++ b/tests/integration/targets/yum_versionlock/tasks/main.yml @@ -63,7 +63,7 @@ yum: name: '*' state: latest - check_mode: yes + check_mode: true register: update_all_packages when: yum_updates.results | length != 0 diff --git a/tests/integration/targets/zypper/tasks/zypper.yml b/tests/integration/targets/zypper/tasks/zypper.yml index ab1bc179eb..9e840676e9 100644 --- a/tests/integration/targets/zypper/tasks/zypper.yml +++ b/tests/integration/targets/zypper/tasks/zypper.yml @@ -144,7 +144,7 @@ name: doesnotexist state: present register: zypper_result - ignore_errors: yes + ignore_errors: true - name: verify package installation failed assert: @@ -168,7 +168,7 @@ name: "{{remote_tmp_dir | expanduser}}/zypper1/broken.rpm" state: present register: zypper_result - ignore_errors: yes + ignore_errors: true - debug: var=zypper_result @@ -219,7 +219,7 @@ - name: install empty rpm zypper: name: "{{ remote_tmp_dir | expanduser }}/zypper2/rpm-build/noarch/empty-1-0.noarch.rpm" - disable_gpg_check: yes + disable_gpg_check: true register: zypper_result - name: check empty with rpm @@ -243,7 +243,7 @@ zypper: name: "{{ remote_tmp_dir | expanduser }}/zypper2/rpm-build/noarch/empty-1-0.noarch.rpm" state: installed - disable_gpg_check: yes + disable_gpg_check: true extra_args_precommand: --root {{ remote_tmp_dir | expanduser }}/testdir/ - name: check that dir var is exist @@ -322,7 +322,7 @@ - +hello state: absent register: zypper_res - ignore_errors: yes + ignore_errors: true - name: verify simultaneous install/remove failed with absent assert: @@ -335,7 +335,7 @@ name: openSUSE-2016-128 type: patch state: absent - ignore_errors: yes + ignore_errors: true register: zypper_patch - assert: that: @@ -346,7 +346,7 @@ zypper: name: "{{ hello_package_url }}" state: absent - ignore_errors: yes + ignore_errors: true register: zypper_rm - assert: that: @@ -440,7 +440,7 @@ # zypper: # name: gnu-netcat # state: present -# ignore_errors: yes +# ignore_errors: true # register: zypper_pkg_conflict # # - assert: diff --git a/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml b/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml index 740cffd37d..db4c3afb5d 100644 --- a/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml +++ b/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml @@ -53,7 +53,7 @@ - name: use refresh option community.general.zypper_repository: name: testrefresh - refresh: no + refresh: false state: present repo: http://download.videolan.org/pub/vlc/SuSE/Leap_{{ ansible_distribution_version }}/ @@ -94,7 +94,7 @@ - name: check repo is updated by url command: zypper lr chrome1 register: zypper_result1 - ignore_errors: yes + ignore_errors: true - name: check repo is updated by url command: zypper lr chrome2