From 872537f4def46dd6af7168f88b985cf5f099b201 Mon Sep 17 00:00:00 2001 From: Thomas Woerner <twoerner@redhat.com> Date: Tue, 20 Dec 2022 13:49:02 +0100 Subject: [PATCH] group: Use FQCN for ansible.builtin Use Fully Qualified Collection Name (FQCN) for ansible builtins. This is ansible.builtin.set_fact instead of set_fact for example and aplies for all actions that are part of ansible.builtin. All the replaced ansible.builtins: assert, command, copy, debug, fail, fetch, file, import_playbook, import_tasks, include_role, include_tasks, include_vars, package, set_fact, shell, slurp, stat, systemd --- tests/group/test_group.yml | 4 ++-- tests/group/test_group_client_context.yml | 6 +++--- tests/group/test_group_external_members.yml | 2 +- tests/group/test_group_idoverrideuser.yml | 6 +++--- tests/group/test_group_membermanager.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/group/test_group.yml b/tests/group/test_group.yml index 8395d6b5..d728e45f 100644 --- a/tests/group/test_group.yml +++ b/tests/group/test_group.yml @@ -6,12 +6,12 @@ tasks: # setup - - include_tasks: ../env_freeipa_facts.yml + - ansible.builtin.include_tasks: ../env_freeipa_facts.yml # GET FQDN_AT_DOMAIN - name: Get fqdn_at_domain - set_fact: + ansible.builtin.set_fact: fqdn_at_domain: "{{ ansible_facts['fqdn'] + '@' + ipaserver_realm }}" # CLEANUP TEST ITEMS diff --git a/tests/group/test_group_client_context.yml b/tests/group/test_group_client_context.yml index 45e8467b..4a1d7ac9 100644 --- a/tests/group/test_group_client_context.yml +++ b/tests/group/test_group_client_context.yml @@ -6,7 +6,7 @@ tasks: - name: Include FreeIPA facts. - include_tasks: ../env_freeipa_facts.yml + ansible.builtin.include_tasks: ../env_freeipa_facts.yml # Test will only be executed if host is not a server. - name: Execute with server context in the client. @@ -27,13 +27,13 @@ # in upstream CI. - name: Test group using client context, in client host. - import_playbook: test_group.yml + ansible.builtin.import_playbook: test_group.yml when: groups['ipaclients'] vars: ipa_test_host: ipaclients - name: Test group using client context, in server host. - import_playbook: test_group.yml + ansible.builtin.import_playbook: test_group.yml when: groups['ipaclients'] is not defined or not groups['ipaclients'] vars: ipa_context: client diff --git a/tests/group/test_group_external_members.yml b/tests/group/test_group_external_members.yml index 5b2f3202..a24958d5 100644 --- a/tests/group/test_group_external_members.yml +++ b/tests/group/test_group_external_members.yml @@ -6,7 +6,7 @@ tasks: - - include_tasks: ../env_freeipa_facts.yml + - ansible.builtin.include_tasks: ../env_freeipa_facts.yml - block: diff --git a/tests/group/test_group_idoverrideuser.yml b/tests/group/test_group_idoverrideuser.yml index 3a5be506..2dc78845 100644 --- a/tests/group/test_group_idoverrideuser.yml +++ b/tests/group/test_group_idoverrideuser.yml @@ -9,11 +9,11 @@ ad_domain: "{{ test_ad_domain | default('ad.ipa.test') }}" tasks: - - include_tasks: ../env_freeipa_facts.yml + - ansible.builtin.include_tasks: ../env_freeipa_facts.yml - block: - name: Create idoverrideuser. - shell: | + ansible.builtin.shell: | kinit -c idoverride_cache admin <<< SomeADMINpassword ipa idoverrideuser-add "Default Trust View" {{ ad_user }} kdestroy -A -q -c idoverride_cache @@ -95,7 +95,7 @@ always: - name: Remove idoverrideuser. - shell: | + ansible.builtin.shell: | kinit -c idoverride_cache admin <<< SomeADMINpassword ipa idoverrideuser-del "Default Trust View" {{ ad_user }} kdestroy -A -q -c idoverride_cache diff --git a/tests/group/test_group_membermanager.yml b/tests/group/test_group_membermanager.yml index 4105e75d..209301b8 100644 --- a/tests/group/test_group_membermanager.yml +++ b/tests/group/test_group_membermanager.yml @@ -5,7 +5,7 @@ gather_facts: false tasks: - - include_tasks: ../env_freeipa_facts.yml + - ansible.builtin.include_tasks: ../env_freeipa_facts.yml - name: Tests requiring IPA version 4.8.4+ block: -- GitLab