diff --git a/tests/integration/targets/alternatives/aliases b/tests/integration/targets/alternatives/aliases index f280525b6e..0d6aaf54ed 100644 --- a/tests/integration/targets/alternatives/aliases +++ b/tests/integration/targets/alternatives/aliases @@ -6,5 +6,4 @@ azp/posix/3 destructive needs/root skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/apk/aliases b/tests/integration/targets/apk/aliases index 5a19e68068..b1fe0d2e50 100644 --- a/tests/integration/targets/apk/aliases +++ b/tests/integration/targets/apk/aliases @@ -5,7 +5,6 @@ azp/posix/2 needs/root destructive -skip/osx skip/macos skip/freebsd skip/rhel diff --git a/tests/integration/targets/archive/aliases b/tests/integration/targets/archive/aliases index 40325f0b8a..3fb9ea2f5b 100644 --- a/tests/integration/targets/archive/aliases +++ b/tests/integration/targets/archive/aliases @@ -5,4 +5,3 @@ azp/posix/2 needs/root destructive -skip/osx # FIXME diff --git a/tests/integration/targets/btrfs_subvolume/aliases b/tests/integration/targets/btrfs_subvolume/aliases index 68b9624de0..3e8ad65316 100644 --- a/tests/integration/targets/btrfs_subvolume/aliases +++ b/tests/integration/targets/btrfs_subvolume/aliases @@ -7,5 +7,4 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/cloud_init_data_facts/aliases b/tests/integration/targets/cloud_init_data_facts/aliases index d0851959d9..eb90ce1b09 100644 --- a/tests/integration/targets/cloud_init_data_facts/aliases +++ b/tests/integration/targets/cloud_init_data_facts/aliases @@ -4,6 +4,5 @@ azp/posix/1 destructive -skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/copr/aliases b/tests/integration/targets/copr/aliases index 1eb76708cf..a8ca840aa8 100644 --- a/tests/integration/targets/copr/aliases +++ b/tests/integration/targets/copr/aliases @@ -5,7 +5,6 @@ azp/posix/1 needs/root skip/macos -skip/osx skip/freebsd skip/rhel10.0 # FIXME skip/rhel10.1 # FIXME diff --git a/tests/integration/targets/cpanm/aliases b/tests/integration/targets/cpanm/aliases index 9458e87796..0068f228a4 100644 --- a/tests/integration/targets/cpanm/aliases +++ b/tests/integration/targets/cpanm/aliases @@ -5,5 +5,4 @@ azp/posix/3 destructive skip/macos -skip/osx skip/freebsd diff --git a/tests/integration/targets/cronvar/aliases b/tests/integration/targets/cronvar/aliases index b6cfe52a65..2bd1c3ad97 100644 --- a/tests/integration/targets/cronvar/aliases +++ b/tests/integration/targets/cronvar/aliases @@ -4,5 +4,4 @@ azp/posix/3 destructive -skip/osx skip/macos diff --git a/tests/integration/targets/django_command/aliases b/tests/integration/targets/django_command/aliases index aa732ad570..e93ac96cd6 100644 --- a/tests/integration/targets/django_command/aliases +++ b/tests/integration/targets/django_command/aliases @@ -5,21 +5,7 @@ azp/posix/2 skip/freebsd skip/macos -skip/osx -skip/rhel8.2 -skip/rhel8.3 -skip/rhel8.4 -skip/rhel8.5 -skip/rhel8.6 -skip/rhel8.7 -skip/rhel8.8 -skip/rhel9.0 -skip/rhel9.1 -skip/rhel9.2 skip/rhel9.3 -skip/rhel9.4 -skip/rhel9.5 -skip/rhel9.6 skip/rhel9.7 skip/rhel10.0 skip/rhel10.1 diff --git a/tests/integration/targets/django_manage/aliases b/tests/integration/targets/django_manage/aliases index aa732ad570..e93ac96cd6 100644 --- a/tests/integration/targets/django_manage/aliases +++ b/tests/integration/targets/django_manage/aliases @@ -5,21 +5,7 @@ azp/posix/2 skip/freebsd skip/macos -skip/osx -skip/rhel8.2 -skip/rhel8.3 -skip/rhel8.4 -skip/rhel8.5 -skip/rhel8.6 -skip/rhel8.7 -skip/rhel8.8 -skip/rhel9.0 -skip/rhel9.1 -skip/rhel9.2 skip/rhel9.3 -skip/rhel9.4 -skip/rhel9.5 -skip/rhel9.6 skip/rhel9.7 skip/rhel10.0 skip/rhel10.1 diff --git a/tests/integration/targets/dnf_versionlock/aliases b/tests/integration/targets/dnf_versionlock/aliases index 91e447fef0..5c480caa7e 100644 --- a/tests/integration/targets/dnf_versionlock/aliases +++ b/tests/integration/targets/dnf_versionlock/aliases @@ -4,5 +4,4 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/dpkg_divert/aliases b/tests/integration/targets/dpkg_divert/aliases index 24ffc1e350..959fe767f6 100644 --- a/tests/integration/targets/dpkg_divert/aliases +++ b/tests/integration/targets/dpkg_divert/aliases @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later azp/posix/1 -skip/osx skip/macos skip/rhel skip/freebsd diff --git a/tests/integration/targets/ejabberd_user/aliases b/tests/integration/targets/ejabberd_user/aliases index 11c37f6bb2..a7da760dde 100644 --- a/tests/integration/targets/ejabberd_user/aliases +++ b/tests/integration/targets/ejabberd_user/aliases @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later azp/posix/3 -skip/osx skip/macos skip/freebsd skip/alpine diff --git a/tests/integration/targets/etcd3/aliases b/tests/integration/targets/etcd3/aliases index d0851959d9..eb90ce1b09 100644 --- a/tests/integration/targets/etcd3/aliases +++ b/tests/integration/targets/etcd3/aliases @@ -4,6 +4,5 @@ azp/posix/1 destructive -skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/filesystem/aliases b/tests/integration/targets/filesystem/aliases index f7b7bdba4a..f63da08a90 100644 --- a/tests/integration/targets/filesystem/aliases +++ b/tests/integration/targets/filesystem/aliases @@ -5,5 +5,4 @@ azp/posix/1 azp/posix/vm destructive -skip/osx skip/macos diff --git a/tests/integration/targets/flatpak/aliases b/tests/integration/targets/flatpak/aliases index 5775984449..90f5a5e324 100644 --- a/tests/integration/targets/flatpak/aliases +++ b/tests/integration/targets/flatpak/aliases @@ -5,7 +5,6 @@ azp/posix/3 destructive skip/freebsd -skip/osx skip/macos skip/rhel needs/root diff --git a/tests/integration/targets/flatpak_remote/aliases b/tests/integration/targets/flatpak_remote/aliases index 5775984449..90f5a5e324 100644 --- a/tests/integration/targets/flatpak_remote/aliases +++ b/tests/integration/targets/flatpak_remote/aliases @@ -5,7 +5,6 @@ azp/posix/3 destructive skip/freebsd -skip/osx skip/macos skip/rhel needs/root diff --git a/tests/integration/targets/gem/aliases b/tests/integration/targets/gem/aliases index 80233afc0c..e310ac5a62 100644 --- a/tests/integration/targets/gem/aliases +++ b/tests/integration/targets/gem/aliases @@ -4,5 +4,4 @@ azp/posix/1 destructive -skip/osx skip/macos diff --git a/tests/integration/targets/homebrew_services/aliases b/tests/integration/targets/homebrew_services/aliases index 0daae2fe77..75037bb89a 100644 --- a/tests/integration/targets/homebrew_services/aliases +++ b/tests/integration/targets/homebrew_services/aliases @@ -7,4 +7,3 @@ skip/freebsd skip/rhel skip/docker skip/macos14.3 -skip/macos13.2 diff --git a/tests/integration/targets/homectl/aliases b/tests/integration/targets/homectl/aliases index 3a30dc2dfb..6ca809e997 100644 --- a/tests/integration/targets/homectl/aliases +++ b/tests/integration/targets/homectl/aliases @@ -4,15 +4,8 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos -skip/rhel9.0 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ -skip/rhel9.1 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ -skip/rhel9.2 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ skip/rhel9.3 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ -skip/rhel9.4 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ -skip/rhel9.5 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ -skip/rhel9.6 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ skip/rhel9.7 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ skip/rhel10.0 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ skip/rhel10.1 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/ diff --git a/tests/integration/targets/influxdb_user/aliases b/tests/integration/targets/influxdb_user/aliases index 8c1a7b3298..9998e8cb5c 100644 --- a/tests/integration/targets/influxdb_user/aliases +++ b/tests/integration/targets/influxdb_user/aliases @@ -5,7 +5,6 @@ azp/posix/1 destructive disabled -skip/osx skip/macos skip/freebsd skip/rhel diff --git a/tests/integration/targets/iptables_state/aliases b/tests/integration/targets/iptables_state/aliases index 451bb05370..15634f4861 100644 --- a/tests/integration/targets/iptables_state/aliases +++ b/tests/integration/targets/iptables_state/aliases @@ -7,7 +7,6 @@ azp/posix/vm destructive skip/docker # kernel modules not loadable skip/freebsd # no iptables/netfilter (Linux specific) -skip/osx # no iptables/netfilter (Linux specific) skip/macos # no iptables/netfilter (Linux specific) skip/ubuntu22.04 # TODO there's a problem here! diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases index e5d9a9f844..580203bf13 100644 --- a/tests/integration/targets/iso_extract/aliases +++ b/tests/integration/targets/iso_extract/aliases @@ -5,23 +5,11 @@ azp/posix/1 needs/target/setup_epel destructive -skip/osx # FIXME -skip/rhel9.0 # FIXME -skip/rhel9.1 # FIXME -skip/rhel9.2 # FIXME skip/rhel9.3 # FIXME -skip/rhel9.4 # FIXME -skip/rhel9.5 # FIXME -skip/rhel9.6 # FIXME skip/rhel9.7 # FIXME skip/rhel10.0 # FIXME skip/rhel10.1 # FIXME -skip/freebsd12.4 # FIXME -skip/freebsd13.2 # FIXME -skip/freebsd13.3 # FIXME -skip/freebsd13.4 # FIXME skip/freebsd13.5 # FIXME -skip/freebsd14.0 # FIXME skip/freebsd14.1 # FIXME skip/freebsd14.2 # FIXME skip/freebsd14.3 # FIXME diff --git a/tests/integration/targets/java_cert/aliases b/tests/integration/targets/java_cert/aliases index ce2f5c10b3..50b80ecbe7 100644 --- a/tests/integration/targets/java_cert/aliases +++ b/tests/integration/targets/java_cert/aliases @@ -4,7 +4,6 @@ azp/posix/3 destructive -skip/osx skip/macos skip/freebsd needs/root diff --git a/tests/integration/targets/java_keystore/aliases b/tests/integration/targets/java_keystore/aliases index ce2f5c10b3..50b80ecbe7 100644 --- a/tests/integration/targets/java_keystore/aliases +++ b/tests/integration/targets/java_keystore/aliases @@ -4,7 +4,6 @@ azp/posix/3 destructive -skip/osx skip/macos skip/freebsd needs/root diff --git a/tests/integration/targets/jboss/aliases b/tests/integration/targets/jboss/aliases index 29e1a21b30..823bc3f9fd 100644 --- a/tests/integration/targets/jboss/aliases +++ b/tests/integration/targets/jboss/aliases @@ -4,7 +4,6 @@ azp/posix/1 destructive -skip/osx skip/macos skip/freebsd skip/rhel diff --git a/tests/integration/targets/kea_command/aliases b/tests/integration/targets/kea_command/aliases index 186ad8d1fc..33855521a0 100644 --- a/tests/integration/targets/kea_command/aliases +++ b/tests/integration/targets/kea_command/aliases @@ -15,6 +15,5 @@ skip/docker skip/fedora # TODO: make this work (not running in CI right now) skip/freebsd skip/macos -skip/osx skip/rhel # TODO: make this work skip/ubuntu22.04 diff --git a/tests/integration/targets/kernel_blacklist/aliases b/tests/integration/targets/kernel_blacklist/aliases index 91e447fef0..5c480caa7e 100644 --- a/tests/integration/targets/kernel_blacklist/aliases +++ b/tests/integration/targets/kernel_blacklist/aliases @@ -4,5 +4,4 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/ldap_inc/aliases b/tests/integration/targets/ldap_inc/aliases index dbced1ac4c..1d169c02a7 100644 --- a/tests/integration/targets/ldap_inc/aliases +++ b/tests/integration/targets/ldap_inc/aliases @@ -4,7 +4,6 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos skip/rhel needs/root diff --git a/tests/integration/targets/ldap_search/aliases b/tests/integration/targets/ldap_search/aliases index dbced1ac4c..1d169c02a7 100644 --- a/tests/integration/targets/ldap_search/aliases +++ b/tests/integration/targets/ldap_search/aliases @@ -4,7 +4,6 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos skip/rhel needs/root diff --git a/tests/integration/targets/listen_ports_facts/aliases b/tests/integration/targets/listen_ports_facts/aliases index 94b2ea9e3d..0068f228a4 100644 --- a/tests/integration/targets/listen_ports_facts/aliases +++ b/tests/integration/targets/listen_ports_facts/aliases @@ -4,6 +4,5 @@ azp/posix/3 destructive -skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/lookup_etcd3/aliases b/tests/integration/targets/lookup_etcd3/aliases index 17aa45a003..9e442f3ab1 100644 --- a/tests/integration/targets/lookup_etcd3/aliases +++ b/tests/integration/targets/lookup_etcd3/aliases @@ -5,6 +5,5 @@ azp/posix/1 destructive needs/target/setup_etcd3 -skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/lookup_passwordstore/aliases b/tests/integration/targets/lookup_passwordstore/aliases index f870050e1e..c93b5087df 100644 --- a/tests/integration/targets/lookup_passwordstore/aliases +++ b/tests/integration/targets/lookup_passwordstore/aliases @@ -5,5 +5,4 @@ azp/posix/1 destructive skip/rhel -skip/osx # FIXME https://github.com/ansible-collections/community.general/issues/2978 skip/macos # FIXME https://github.com/ansible-collections/community.general/issues/2978 diff --git a/tests/integration/targets/lvg/aliases b/tests/integration/targets/lvg/aliases index 80e193352b..ed06749c93 100644 --- a/tests/integration/targets/lvg/aliases +++ b/tests/integration/targets/lvg/aliases @@ -7,7 +7,6 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos skip/alpine3.21 # TODO try to fix skip/alpine3.22 # TODO try to fix diff --git a/tests/integration/targets/lvg_rename/aliases b/tests/integration/targets/lvg_rename/aliases index 48ca533d3c..462fa885da 100644 --- a/tests/integration/targets/lvg_rename/aliases +++ b/tests/integration/targets/lvg_rename/aliases @@ -8,5 +8,4 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/lvm_pv/aliases b/tests/integration/targets/lvm_pv/aliases index 48ca533d3c..462fa885da 100644 --- a/tests/integration/targets/lvm_pv/aliases +++ b/tests/integration/targets/lvm_pv/aliases @@ -8,5 +8,4 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/lvm_pv_move_data/aliases b/tests/integration/targets/lvm_pv_move_data/aliases index a77d4c79ea..525b2de319 100644 --- a/tests/integration/targets/lvm_pv_move_data/aliases +++ b/tests/integration/targets/lvm_pv_move_data/aliases @@ -8,5 +8,4 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/lvol/aliases b/tests/integration/targets/lvol/aliases index 14709f86cc..e3e985aa77 100644 --- a/tests/integration/targets/lvol/aliases +++ b/tests/integration/targets/lvol/aliases @@ -7,5 +7,4 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/monit/aliases b/tests/integration/targets/monit/aliases index 5a4c8d38ef..62ef1f7347 100644 --- a/tests/integration/targets/monit/aliases +++ b/tests/integration/targets/monit/aliases @@ -5,7 +5,6 @@ azp/posix/2 destructive needs/target/setup_epel -skip/osx skip/macos skip/freebsd skip/rhel # FIXME diff --git a/tests/integration/targets/mqtt/aliases b/tests/integration/targets/mqtt/aliases index 2a8110499f..adeb83129a 100644 --- a/tests/integration/targets/mqtt/aliases +++ b/tests/integration/targets/mqtt/aliases @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later azp/posix/1 -skip/osx skip/macos skip/freebsd skip/rhel diff --git a/tests/integration/targets/mssql_script/aliases b/tests/integration/targets/mssql_script/aliases index 023e2edce5..0f4c5a0ec6 100644 --- a/tests/integration/targets/mssql_script/aliases +++ b/tests/integration/targets/mssql_script/aliases @@ -2,7 +2,6 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -skip/osx skip/macos skip/freebsd skip/rhel diff --git a/tests/integration/targets/nomad/aliases b/tests/integration/targets/nomad/aliases index a1a5fdb875..0dac6d38e0 100644 --- a/tests/integration/targets/nomad/aliases +++ b/tests/integration/targets/nomad/aliases @@ -5,6 +5,5 @@ azp/posix/2 nomad_job_info destructive -skip/centos6 skip/freebsd disabled # TODO diff --git a/tests/integration/targets/odbc/aliases b/tests/integration/targets/odbc/aliases index dfe8cca4d3..20fc719aff 100644 --- a/tests/integration/targets/odbc/aliases +++ b/tests/integration/targets/odbc/aliases @@ -4,16 +4,8 @@ azp/posix/1 destructive -skip/osx skip/macos -skip/rhel8.0 -skip/rhel9.0 -skip/rhel9.1 -skip/rhel9.2 skip/rhel9.3 -skip/rhel9.4 -skip/rhel9.5 -skip/rhel9.6 skip/rhel9.7 skip/rhel10.0 skip/rhel10.1 diff --git a/tests/integration/targets/pacman/aliases b/tests/integration/targets/pacman/aliases index 9274c2957e..ac7ff1d4cf 100644 --- a/tests/integration/targets/pacman/aliases +++ b/tests/integration/targets/pacman/aliases @@ -5,7 +5,6 @@ azp/posix/1 destructive skip/freebsd -skip/osx skip/macos skip/rhel needs/root diff --git a/tests/integration/targets/pam_limits/aliases b/tests/integration/targets/pam_limits/aliases index 91e447fef0..5c480caa7e 100644 --- a/tests/integration/targets/pam_limits/aliases +++ b/tests/integration/targets/pam_limits/aliases @@ -4,5 +4,4 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/pamd/aliases b/tests/integration/targets/pamd/aliases index 91e447fef0..5c480caa7e 100644 --- a/tests/integration/targets/pamd/aliases +++ b/tests/integration/targets/pamd/aliases @@ -4,5 +4,4 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/parted/aliases b/tests/integration/targets/parted/aliases index a2c62fd76a..e02a2ce95d 100644 --- a/tests/integration/targets/parted/aliases +++ b/tests/integration/targets/parted/aliases @@ -5,7 +5,6 @@ azp/posix/2 azp/posix/vm skip/freebsd -skip/osx skip/macos skip/docker needs/root diff --git a/tests/integration/targets/pkgng/aliases b/tests/integration/targets/pkgng/aliases index e13fde32ce..e9e3564f5b 100644 --- a/tests/integration/targets/pkgng/aliases +++ b/tests/integration/targets/pkgng/aliases @@ -5,5 +5,4 @@ azp/posix/1 needs/root skip/docker -skip/osx skip/rhel diff --git a/tests/integration/targets/redis_info/aliases b/tests/integration/targets/redis_info/aliases index 5371a70d35..dfcf59cbd3 100644 --- a/tests/integration/targets/redis_info/aliases +++ b/tests/integration/targets/redis_info/aliases @@ -4,6 +4,5 @@ azp/posix/1 destructive -skip/osx skip/macos skip/rhel diff --git a/tests/integration/targets/rundeck/aliases b/tests/integration/targets/rundeck/aliases index 6c793109b8..b064d1fd02 100644 --- a/tests/integration/targets/rundeck/aliases +++ b/tests/integration/targets/rundeck/aliases @@ -4,8 +4,6 @@ azp/posix/1 destructive -skip/osx skip/macos -skip/windows skip/freebsd unsupported diff --git a/tests/integration/targets/snap/aliases b/tests/integration/targets/snap/aliases index 4e52ff0753..3909b91a2d 100644 --- a/tests/integration/targets/snap/aliases +++ b/tests/integration/targets/snap/aliases @@ -7,7 +7,5 @@ azp/posix/vm skip/alpine skip/fedora skip/freebsd -skip/osx skip/macos skip/docker -skip/rhel8.8 # TODO: fix diff --git a/tests/integration/targets/snap_alias/aliases b/tests/integration/targets/snap_alias/aliases index 4e52ff0753..3909b91a2d 100644 --- a/tests/integration/targets/snap_alias/aliases +++ b/tests/integration/targets/snap_alias/aliases @@ -7,7 +7,5 @@ azp/posix/vm skip/alpine skip/fedora skip/freebsd -skip/osx skip/macos skip/docker -skip/rhel8.8 # TODO: fix diff --git a/tests/integration/targets/sysrc/aliases b/tests/integration/targets/sysrc/aliases index e13fde32ce..e9e3564f5b 100644 --- a/tests/integration/targets/sysrc/aliases +++ b/tests/integration/targets/sysrc/aliases @@ -5,5 +5,4 @@ azp/posix/1 needs/root skip/docker -skip/osx skip/rhel diff --git a/tests/integration/targets/systemd_creds_decrypt/aliases b/tests/integration/targets/systemd_creds_decrypt/aliases index cadd840e70..42223f4e48 100644 --- a/tests/integration/targets/systemd_creds_decrypt/aliases +++ b/tests/integration/targets/systemd_creds_decrypt/aliases @@ -6,5 +6,4 @@ needs/root azp/posix/1 skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/systemd_creds_encrypt/aliases b/tests/integration/targets/systemd_creds_encrypt/aliases index cadd840e70..42223f4e48 100644 --- a/tests/integration/targets/systemd_creds_encrypt/aliases +++ b/tests/integration/targets/systemd_creds_encrypt/aliases @@ -6,5 +6,4 @@ needs/root azp/posix/1 skip/freebsd -skip/osx skip/macos diff --git a/tests/integration/targets/systemd_info/aliases b/tests/integration/targets/systemd_info/aliases index 51faf69a02..ba6ee9b55a 100644 --- a/tests/integration/targets/systemd_info/aliases +++ b/tests/integration/targets/systemd_info/aliases @@ -5,5 +5,4 @@ needs/root azp/posix/1 skip/freebsd -skip/osx skip/macos \ No newline at end of file diff --git a/tests/integration/targets/terraform/aliases b/tests/integration/targets/terraform/aliases index 88fdf9d0f5..9b60269985 100644 --- a/tests/integration/targets/terraform/aliases +++ b/tests/integration/targets/terraform/aliases @@ -3,7 +3,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later azp/posix/1 -skip/windows -skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/timezone/aliases b/tests/integration/targets/timezone/aliases index 1558310e70..e310ac5a62 100644 --- a/tests/integration/targets/timezone/aliases +++ b/tests/integration/targets/timezone/aliases @@ -4,6 +4,4 @@ azp/posix/1 destructive -skip/osx skip/macos -skip/rhel7.9 # TODO: '/bin/timedatectl set-local-rtc no' fails with 'Failed to set local RTC: Failed to set RTC to local/UTC: Input/output error' diff --git a/tests/integration/targets/ufw/aliases b/tests/integration/targets/ufw/aliases index 48c98ffe8c..5e3d0dea32 100644 --- a/tests/integration/targets/ufw/aliases +++ b/tests/integration/targets/ufw/aliases @@ -4,17 +4,9 @@ azp/posix/2 azp/posix/vm -skip/osx skip/macos skip/freebsd -skip/rhel8.0 # FIXME -skip/rhel9.0 # FIXME -skip/rhel9.1 # FIXME -skip/rhel9.2 # FIXME skip/rhel9.3 # FIXME -skip/rhel9.4 # FIXME -skip/rhel9.5 # FIXME -skip/rhel9.6 # FIXME skip/rhel9.7 # FIXME skip/rhel10.0 # FIXME skip/rhel10.1 # FIXME diff --git a/tests/integration/targets/xattr/aliases b/tests/integration/targets/xattr/aliases index f1655373c9..20ce110ec5 100644 --- a/tests/integration/targets/xattr/aliases +++ b/tests/integration/targets/xattr/aliases @@ -6,6 +6,5 @@ azp/posix/2 azp/posix/vm skip/docker skip/freebsd -skip/osx skip/macos destructive diff --git a/tests/integration/targets/xfs_quota/aliases b/tests/integration/targets/xfs_quota/aliases index 20cead5836..66996ccaa4 100644 --- a/tests/integration/targets/xfs_quota/aliases +++ b/tests/integration/targets/xfs_quota/aliases @@ -6,6 +6,5 @@ azp/posix/1 azp/posix/vm needs/privileged needs/root -skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/yum_versionlock/aliases b/tests/integration/targets/yum_versionlock/aliases index f4c4e341bf..70fc58614a 100644 --- a/tests/integration/targets/yum_versionlock/aliases +++ b/tests/integration/targets/yum_versionlock/aliases @@ -4,7 +4,5 @@ azp/posix/1 skip/freebsd -skip/osx skip/macos -skip/rhel8.4 # TODO make sure that tests work on 8.4 as well! disabled # TODO diff --git a/tests/integration/targets/zpool/aliases b/tests/integration/targets/zpool/aliases index f40e1901dc..73cd4069d2 100644 --- a/tests/integration/targets/zpool/aliases +++ b/tests/integration/targets/zpool/aliases @@ -7,7 +7,6 @@ azp/posix/vm destructive needs/privileged skip/freebsd -skip/osx skip/macos skip/rhel skip/docker diff --git a/tests/integration/targets/zypper/aliases b/tests/integration/targets/zypper/aliases index 7929548680..e011feecad 100644 --- a/tests/integration/targets/zypper/aliases +++ b/tests/integration/targets/zypper/aliases @@ -5,6 +5,5 @@ azp/posix/1 destructive skip/freebsd -skip/osx skip/macos skip/rhel diff --git a/tests/integration/targets/zypper_repository/aliases b/tests/integration/targets/zypper_repository/aliases index 7929548680..e011feecad 100644 --- a/tests/integration/targets/zypper_repository/aliases +++ b/tests/integration/targets/zypper_repository/aliases @@ -5,6 +5,5 @@ azp/posix/1 destructive skip/freebsd -skip/osx skip/macos skip/rhel diff --git a/tests/utils/ALIASES.md b/tests/utils/ALIASES.md new file mode 100644 index 0000000000..c682984c91 --- /dev/null +++ b/tests/utils/ALIASES.md @@ -0,0 +1,38 @@ + + +# Cleaning up `aliases` skips + +The skip statements in `tests/integration/targets/*/aliases` files may contain specific OSes and their versions. + +For example: + + skip/rhel8.8 + skip/centos6 + skip/macos + +Those items being skipped are called `remotes` and they come from the file `test/lib/ansible_test/_data/completion/remote.txt` +in the `ansible-core` repository. Eventually, these remotes are removed from that `ansible_test` config, +but they keep silently cluttering the aliases files here. + +The scripts `list-remotes` and `clean-aliases-skips` can help you remove those entries from the `aliases` files. +For that, you will need to have a clone of the `ansible-core` repository in your machine. + +In the example below, the path to that repo is `../ansible`: + +```shell +./tests/utils/list-remotes ../ansible +``` + +**Note:** The supported versions of `ansible-core` are hardcoded in `list-remotes`. Those should be updated or automated in the future. + +To remove all the skips that are **not** in that list, you should run: + +```shell +./tests/utils/list-remotes ../ansible | ./tests/utils/clean-aliases-skips +``` + +Make sure to thoroughly review the changes before committing! diff --git a/tests/utils/clean-aliases-skips b/tests/utils/clean-aliases-skips new file mode 100755 index 0000000000..6266ade162 --- /dev/null +++ b/tests/utils/clean-aliases-skips @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +import re +import sys +from pathlib import Path + + +def sanitize(filepath, remotes_re): + with open(filepath) as fileread: + lines = fileread.readlines() + + changed = False + out_lines = [] + for ll in lines: + if not ll.startswith("skip/") or any(r.match(ll) for r in remotes_re): + out_lines.append(ll) + continue + changed = True + + if changed: + print(f"sanitizing {filepath}", file=sys.stderr) + with open(filepath, "w") as filewrite: + filewrite.writelines(out_lines) + + +def main(): + remotes = [x.strip() for x in sys.stdin.readlines()] + remotes.append("docker") + + print(f"Valid remotes: {', '.join(remotes)}", file=sys.stderr) + + remotes_re = [re.compile(rf"^skip/{r}(\s.*)?$") for r in remotes] + + for filepath in Path("tests/integration/targets").glob("*/aliases"): + sanitize(filepath, remotes_re) + + +if __name__ == "__main__": + main() diff --git a/tests/utils/list-remotes b/tests/utils/list-remotes new file mode 100755 index 0000000000..13e72ec84b --- /dev/null +++ b/tests/utils/list-remotes @@ -0,0 +1,29 @@ +#!/bin/sh +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +SUPPORTED_AC2="17 18 19 20" + +[ -z "$1" ] && { + echo 'usage: ./tests/utils/list-remotes ' >&2 + exit 1 +} +ansible_repo_dir="$1" + +( + cd "$ansible_repo_dir" + + versions=$( + for minor in $SUPPORTED_AC2; do + echo v2.$minor.$(git tag -l | awk -F. "\$2 == $minor && /v2\.[0-9]+\.[0-9]+$/ { print \$3 }" | sort -rn | head -1) + done + ) + versions="$versions devel" + + echo "Listing remotes from ansible-core:" $versions >&2 + for head in $versions; do + git checkout -q $head + cat test/lib/ansible_test/_data/completion/remote.txt + done | awk '/[a-z]+(\/[0-9]+)?/ { print $1 }' | sort -u | sed -e s'/\///g' +)