Remove obsolete integration test aliases (#80342)

* Remove obsolete integration test aliases

* Remove obsolete `skip/osx` aliases

* Use `skip/macos` instead of `skip/osx` in docs

19 files changed, 1 insertions, 21 deletions

diff --git a/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst b/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
index e14188d6cc..580c6f5d9e 100644
--- a/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
+++ b/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
@@ -63,7 +63,7 @@ Skipping
 Aliases can be used to skip platforms using one of the following:
 
 - ``skip/freebsd`` - Skip tests on FreeBSD.
-- ``skip/osx`` - Skip tests on macOS.
+- ``skip/macos`` - Skip tests on macOS.
 - ``skip/rhel`` - Skip tests on RHEL.
 - ``skip/docker`` - Skip tests when running in a Docker container.
 
diff --git a/test/integration/targets/ansible-runner/aliases b/test/integration/targets/ansible-runner/aliases
index 13e7d78564..f4caffd1ca 100644
--- a/test/integration/targets/ansible-runner/aliases
+++ b/test/integration/targets/ansible-runner/aliases
@@ -1,5 +1,4 @@
 shippable/posix/group5
 context/controller
-skip/osx
 skip/macos
 skip/freebsd
diff --git a/test/integration/targets/apt/aliases b/test/integration/targets/apt/aliases
index 5f892f9c3d..20c870937f 100644
--- a/test/integration/targets/apt/aliases
+++ b/test/integration/targets/apt/aliases
@@ -1,6 +1,5 @@
 shippable/posix/group2
 destructive
 skip/freebsd
-skip/osx
 skip/macos
 skip/rhel
diff --git a/test/integration/targets/apt_key/aliases b/test/integration/targets/apt_key/aliases
index a820ec9082..97f534a839 100644
--- a/test/integration/targets/apt_key/aliases
+++ b/test/integration/targets/apt_key/aliases
@@ -1,5 +1,4 @@
 shippable/posix/group1
 skip/freebsd
-skip/osx
 skip/macos
 skip/rhel
diff --git a/test/integration/targets/apt_repository/aliases b/test/integration/targets/apt_repository/aliases
index 34e2b54058..b4fe8dbaa0 100644
--- a/test/integration/targets/apt_repository/aliases
+++ b/test/integration/targets/apt_repository/aliases
@@ -1,6 +1,5 @@
 destructive
 shippable/posix/group1
 skip/freebsd
-skip/osx
 skip/macos
 skip/rhel
diff --git a/test/integration/targets/connection_delegation/aliases b/test/integration/targets/connection_delegation/aliases
index 6c96566383..0ce76011e6 100644
--- a/test/integration/targets/connection_delegation/aliases
+++ b/test/integration/targets/connection_delegation/aliases
@@ -1,6 +1,5 @@
 shippable/posix/group3
 context/controller
 skip/freebsd  # No sshpass
-skip/osx  # No sshpass
 skip/macos # No sshpass
 skip/rhel  # No sshpass
diff --git a/test/integration/targets/cron/aliases b/test/integration/targets/cron/aliases
index f2f9ac9ddc..f3703f856d 100644
--- a/test/integration/targets/cron/aliases
+++ b/test/integration/targets/cron/aliases
@@ -1,4 +1,3 @@
 destructive
 shippable/posix/group1
-skip/osx
 skip/macos
diff --git a/test/integration/targets/dnf/aliases b/test/integration/targets/dnf/aliases
index d6f27b8e9e..b12f354743 100644
--- a/test/integration/targets/dnf/aliases
+++ b/test/integration/targets/dnf/aliases
@@ -1,6 +1,4 @@
 destructive
 shippable/posix/group1
-skip/power/centos
 skip/freebsd
-skip/osx
 skip/macos
diff --git a/test/integration/targets/dpkg_selections/aliases b/test/integration/targets/dpkg_selections/aliases
index c0d5684bcb..9c44d752a6 100644
--- a/test/integration/targets/dpkg_selections/aliases
+++ b/test/integration/targets/dpkg_selections/aliases
@@ -1,6 +1,5 @@
 shippable/posix/group1
 destructive
 skip/freebsd
-skip/osx
 skip/macos
 skip/rhel
diff --git a/test/integration/targets/facts_linux_network/aliases b/test/integration/targets/facts_linux_network/aliases
index 100ce23a05..c9e1dc5585 100644
--- a/test/integration/targets/facts_linux_network/aliases
+++ b/test/integration/targets/facts_linux_network/aliases
@@ -1,7 +1,6 @@
 needs/privileged
 shippable/posix/group1
 skip/freebsd
-skip/osx
 skip/macos
 context/target
 destructive
diff --git a/test/integration/targets/iptables/aliases b/test/integration/targets/iptables/aliases
index 7d66ecf89e..73df8aad59 100644
--- a/test/integration/targets/iptables/aliases
+++ b/test/integration/targets/iptables/aliases
@@ -1,5 +1,4 @@
 shippable/posix/group2
 skip/freebsd
-skip/osx
 skip/macos
 skip/docker
diff --git a/test/integration/targets/module_no_log/aliases b/test/integration/targets/module_no_log/aliases
index 9e84f63685..afa1c9c366 100644
--- a/test/integration/targets/module_no_log/aliases
+++ b/test/integration/targets/module_no_log/aliases
@@ -1,5 +1,4 @@
 shippable/posix/group3
 context/controller
 skip/freebsd  # not configured to log user.info to /var/log/syslog
-skip/osx  # not configured to log user.info to /var/log/syslog
 skip/macos # not configured to log user.info to /var/log/syslog
diff --git a/test/integration/targets/old_style_cache_plugins/aliases b/test/integration/targets/old_style_cache_plugins/aliases
index 37773831c0..163129e2c5 100644
--- a/test/integration/targets/old_style_cache_plugins/aliases
+++ b/test/integration/targets/old_style_cache_plugins/aliases
@@ -2,5 +2,4 @@ destructive
 needs/root
 shippable/posix/group5
 context/controller
-skip/osx
 skip/macos
diff --git a/test/integration/targets/package_facts/aliases b/test/integration/targets/package_facts/aliases
index 5a5e4646ce..f5edf4b117 100644
--- a/test/integration/targets/package_facts/aliases
+++ b/test/integration/targets/package_facts/aliases
@@ -1,3 +1,2 @@
 shippable/posix/group2
-skip/osx
 skip/macos
diff --git a/test/integration/targets/service/aliases b/test/integration/targets/service/aliases
index f2f9ac9ddc..f3703f856d 100644
--- a/test/integration/targets/service/aliases
+++ b/test/integration/targets/service/aliases
@@ -1,4 +1,3 @@
 destructive
 shippable/posix/group1
-skip/osx
 skip/macos
diff --git a/test/integration/targets/service_facts/aliases b/test/integration/targets/service_facts/aliases
index 17d3eb75d8..32e10b03cf 100644
--- a/test/integration/targets/service_facts/aliases
+++ b/test/integration/targets/service_facts/aliases
@@ -1,4 +1,3 @@
 shippable/posix/group2
 skip/freebsd
-skip/osx
 skip/macos
diff --git a/test/integration/targets/subversion/aliases b/test/integration/targets/subversion/aliases
index 23ada3cc37..9f1e971c1f 100644
--- a/test/integration/targets/subversion/aliases
+++ b/test/integration/targets/subversion/aliases
@@ -1,7 +1,5 @@
 setup/always/setup_passlib
 shippable/posix/group2
-skip/osx
 skip/macos
-skip/rhel/9.0b  # svn checkout hangs
 destructive
 needs/root
diff --git a/test/integration/targets/unsafe_writes/aliases b/test/integration/targets/unsafe_writes/aliases
index da1b554ed3..3560af2faf 100644
--- a/test/integration/targets/unsafe_writes/aliases
+++ b/test/integration/targets/unsafe_writes/aliases
@@ -1,7 +1,6 @@
 context/target
 needs/root
 skip/freebsd
-skip/osx
 skip/macos
 shippable/posix/group2
 needs/target/setup_remote_tmp_dir
diff --git a/test/integration/targets/yum/aliases b/test/integration/targets/yum/aliases
index 1d49133988..b12f354743 100644
--- a/test/integration/targets/yum/aliases
+++ b/test/integration/targets/yum/aliases
@@ -1,5 +1,4 @@
 destructive
 shippable/posix/group1
 skip/freebsd
-skip/osx
 skip/macos