Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable firewalld tests #239

Merged
merged 1 commit into from
Aug 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/firewalld_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- firewalld - enable integration after migration (https://github.com/ansible-collections/ansible.posix/pull/239).
3 changes: 1 addition & 2 deletions tests/integration/targets/firewalld/aliases
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
destructive
shippable/posix/group3
shippable/posix/group1
skip/aix
skip/freebsd
skip/osx
disabled # fixme
1 change: 1 addition & 0 deletions tests/integration/targets/firewalld/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@
- not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('14.04', '=='))
# Firewalld package on OpenSUSE (15+) require Python 3, so we skip on OpenSUSE running py2 on these newer distros
- not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)
- not (ansible_facts.distribution == "CentOS" and ansible_distribution_major_version is version('7', '==')) # FIXME
4 changes: 1 addition & 3 deletions tests/integration/targets/firewalld/tasks/run_all_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

# firewalld service operation test cases
- include_tasks: service_test_cases.yml
# Skipping on CentOS 8 due to https://github.com/ansible/ansible/issues/64750
when: not (ansible_facts.distribution == "CentOS" and ansible_distribution_major_version is version('8', '=='))

# firewalld port operation test cases
- include_tasks: port_test_cases.yml
Expand All @@ -19,4 +17,4 @@
- import_tasks: source_test_cases.yml

# firewalld zone target operation test cases
- import_tasks: zone_target_test_cases.yml
- import_tasks: zone_target_test_cases.yml
17 changes: 17 additions & 0 deletions tests/integration/targets/setup_pkg_mgr/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
####################################################################
# WARNING: These are designed specifically for Ansible tests #
# and should not be used as examples of how to write Ansible roles #
####################################################################

- set_fact:
pkg_mgr: community.general.pkgng
ansible_pkg_mgr: community.general.pkgng
cacheable: yes
when: ansible_os_family == "FreeBSD"

- set_fact:
pkg_mgr: community.general.zypper
ansible_pkg_mgr: community.general.zypper
cacheable: yes
when: ansible_os_family == "Suse"