diff --git a/tests/ansible/hosts/group_vars/all.yml b/tests/ansible/hosts/group_vars/all.yml index 7ec10d6a..42a087ce 100644 --- a/tests/ansible/hosts/group_vars/all.yml +++ b/tests/ansible/hosts/group_vars/all.yml @@ -6,6 +6,7 @@ ansible_version_major_minor: "{{ ansible_version.major }}.{{ ansible_version.minor }}" ansible_version_major_minor_patch: "{{ ansible_version.major }}.{{ ansible_version.minor }}.{{ ansible_version.revision | regex_search('^[0-9]+') }}" +become_doas_available: false become_unpriv_available: >- {# Vanilla Ansible >= 4 (ansible-core >= 2.11) can use `setfacl` for diff --git a/tests/ansible/hosts/group_vars/debian11.yml b/tests/ansible/hosts/group_vars/debian11.yml index 30c98341..cecc3c50 100644 --- a/tests/ansible/hosts/group_vars/debian11.yml +++ b/tests/ansible/hosts/group_vars/debian11.yml @@ -1,3 +1,4 @@ +become_doas_available: true package_manager_keys: - src: debian-archive-bullseye-automatic.gpg # Debian 11 dest: /etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg diff --git a/tests/ansible/integration/become/doas.yml b/tests/ansible/integration/become/doas.yml index 31858168..296b3084 100644 --- a/tests/ansible/integration/become/doas.yml +++ b/tests/ansible/integration/become/doas.yml @@ -15,12 +15,16 @@ changed_when: false check_mode: false register: doas_default_user + when: + - become_doas_available - assert: that: - doas_default_user.stdout == 'root' fail_msg: doas_default_user={{ doas_default_user }} + when: + - become_doas_available - name: Test doas -> mitogen__user1 become: true @@ -30,6 +34,7 @@ check_mode: false register: doas_mitogen__user1 when: + - become_doas_available - become_unpriv_available - assert: @@ -38,6 +43,7 @@ fail_msg: doas_mitogen__user1={{ doas_mitogen__user1 }} when: + - become_doas_available - become_unpriv_available tags: - doas @@ -61,12 +67,16 @@ changed_when: false check_mode: false register: fq_doas_default_user + when: + - become_doas_available - assert: that: - fq_doas_default_user.stdout == 'root' fail_msg: fq_doas_default_user={{ fq_doas_default_user }} + when: + - become_doas_available - name: Test community.general.doas -> mitogen__user1 become: true @@ -76,6 +86,7 @@ check_mode: false register: fq_doas_mitogen__user1 when: + - become_doas_available - become_unpriv_available - assert: @@ -84,6 +95,7 @@ fail_msg: fq_doas_mitogen__user1={{ fq_doas_mitogen__user1 }} when: + - become_doas_available - become_unpriv_available tags: - doas