From 988d410e171c5a0983370ecf8c183b2d0b01d509 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Mon, 28 Sep 2020 01:33:11 -0400 Subject: [PATCH] [stable-2.10] Test changes to allow using "macos" test image (#71849) (#71861) * Add link to remote.sh from macos.sh * Add skip/macos to tests that have skip/osx. (cherry picked from commit 69840811111b77a06a2f8143ce83f10f01837edd) Co-authored-by: Sam Doran --- test/integration/targets/ansible-runner/aliases | 1 + test/integration/targets/apt/aliases | 1 + test/integration/targets/apt_key/aliases | 1 + test/integration/targets/apt_repository/aliases | 1 + test/integration/targets/connection_delegation/aliases | 1 + test/integration/targets/cron/aliases | 1 + test/integration/targets/dnf/aliases | 1 + test/integration/targets/dpkg_selections/aliases | 1 + test/integration/targets/facts_linux_network/aliases | 1 + .../integration/targets/incidental_cloud_init_data_facts/aliases | 1 + test/integration/targets/incidental_flatpak_remote/aliases | 1 + .../targets/incidental_inventory_docker_swarm/aliases | 1 + test/integration/targets/incidental_mongodb_parameter/aliases | 1 + test/integration/targets/incidental_setup_zabbix/aliases | 1 + test/integration/targets/incidental_timezone/aliases | 1 + test/integration/targets/incidental_ufw/aliases | 1 + test/integration/targets/incidental_zabbix_host/aliases | 1 + test/integration/targets/module_no_log/aliases | 1 + test/integration/targets/old_style_cache_plugins/aliases | 1 + test/integration/targets/package_facts/aliases | 1 + test/integration/targets/service/aliases | 1 + test/integration/targets/service_facts/aliases | 1 + test/integration/targets/subversion/aliases | 1 + test/integration/targets/yum/aliases | 1 + test/utils/shippable/macos.sh | 1 + 25 files changed, 25 insertions(+) create mode 120000 test/utils/shippable/macos.sh diff --git a/test/integration/targets/ansible-runner/aliases b/test/integration/targets/ansible-runner/aliases index 93e6e4c412f..ec9eb3af233 100644 --- a/test/integration/targets/ansible-runner/aliases +++ b/test/integration/targets/ansible-runner/aliases @@ -2,4 +2,5 @@ shippable/posix/group3 skip/python3 skip/aix skip/osx +skip/macos skip/freebsd diff --git a/test/integration/targets/apt/aliases b/test/integration/targets/apt/aliases index 7172fbb6d8e..941bce38b8c 100644 --- a/test/integration/targets/apt/aliases +++ b/test/integration/targets/apt/aliases @@ -2,5 +2,6 @@ shippable/posix/group5 destructive skip/freebsd skip/osx +skip/macos skip/rhel skip/aix diff --git a/test/integration/targets/apt_key/aliases b/test/integration/targets/apt_key/aliases index 223904787a0..f46fd7011a9 100644 --- a/test/integration/targets/apt_key/aliases +++ b/test/integration/targets/apt_key/aliases @@ -1,5 +1,6 @@ shippable/posix/group1 skip/freebsd skip/osx +skip/macos skip/rhel skip/aix diff --git a/test/integration/targets/apt_repository/aliases b/test/integration/targets/apt_repository/aliases index 557481e9fb6..7e4621902ab 100644 --- a/test/integration/targets/apt_repository/aliases +++ b/test/integration/targets/apt_repository/aliases @@ -2,5 +2,6 @@ destructive shippable/posix/group1 skip/freebsd skip/osx +skip/macos skip/rhel skip/aix diff --git a/test/integration/targets/connection_delegation/aliases b/test/integration/targets/connection_delegation/aliases index 9950a08844a..87caabdf082 100644 --- a/test/integration/targets/connection_delegation/aliases +++ b/test/integration/targets/connection_delegation/aliases @@ -1,4 +1,5 @@ shippable/posix/group1 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 6e19e26ba97..b2033afd63b 100644 --- a/test/integration/targets/cron/aliases +++ b/test/integration/targets/cron/aliases @@ -2,3 +2,4 @@ destructive shippable/posix/group4 skip/aix skip/osx +skip/macos diff --git a/test/integration/targets/dnf/aliases b/test/integration/targets/dnf/aliases index 802c8cfad53..4d1afd64358 100644 --- a/test/integration/targets/dnf/aliases +++ b/test/integration/targets/dnf/aliases @@ -4,3 +4,4 @@ skip/aix 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 2960fe15d00..55da8c88b82 100644 --- a/test/integration/targets/dpkg_selections/aliases +++ b/test/integration/targets/dpkg_selections/aliases @@ -3,4 +3,5 @@ destructive skip/aix 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 6f1c2c05374..21a4e907dfd 100644 --- a/test/integration/targets/facts_linux_network/aliases +++ b/test/integration/targets/facts_linux_network/aliases @@ -2,3 +2,4 @@ needs/privileged shippable/posix/group2 skip/freebsd skip/osx +skip/macos diff --git a/test/integration/targets/incidental_cloud_init_data_facts/aliases b/test/integration/targets/incidental_cloud_init_data_facts/aliases index e99ab32a62b..85f7fe0f047 100644 --- a/test/integration/targets/incidental_cloud_init_data_facts/aliases +++ b/test/integration/targets/incidental_cloud_init_data_facts/aliases @@ -2,4 +2,5 @@ destructive shippable/posix/incidental skip/aix skip/osx +skip/macos skip/freebsd diff --git a/test/integration/targets/incidental_flatpak_remote/aliases b/test/integration/targets/incidental_flatpak_remote/aliases index c550b0d7794..32b7f55a816 100644 --- a/test/integration/targets/incidental_flatpak_remote/aliases +++ b/test/integration/targets/incidental_flatpak_remote/aliases @@ -3,5 +3,6 @@ destructive skip/aix skip/freebsd skip/osx +skip/macos skip/rhel needs/root diff --git a/test/integration/targets/incidental_inventory_docker_swarm/aliases b/test/integration/targets/incidental_inventory_docker_swarm/aliases index cbebbc7dfea..c3a38c06dac 100644 --- a/test/integration/targets/incidental_inventory_docker_swarm/aliases +++ b/test/integration/targets/incidental_inventory_docker_swarm/aliases @@ -2,6 +2,7 @@ shippable/posix/incidental skip/aix skip/power/centos skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/test/integration/targets/incidental_mongodb_parameter/aliases b/test/integration/targets/incidental_mongodb_parameter/aliases index 45a1ea497d7..dc285483490 100644 --- a/test/integration/targets/incidental_mongodb_parameter/aliases +++ b/test/integration/targets/incidental_mongodb_parameter/aliases @@ -2,6 +2,7 @@ destructive shippable/posix/incidental skip/aix skip/osx +skip/macos skip/freebsd skip/rhel needs/root diff --git a/test/integration/targets/incidental_setup_zabbix/aliases b/test/integration/targets/incidental_setup_zabbix/aliases index 03121b3d066..e4fb0c8f029 100644 --- a/test/integration/targets/incidental_setup_zabbix/aliases +++ b/test/integration/targets/incidental_setup_zabbix/aliases @@ -1,6 +1,7 @@ destructive shippable/posix/group1 skip/osx +skip/macos skip/freebsd skip/rhel hidden diff --git a/test/integration/targets/incidental_timezone/aliases b/test/integration/targets/incidental_timezone/aliases index 78b47900abf..834cafc98e3 100644 --- a/test/integration/targets/incidental_timezone/aliases +++ b/test/integration/targets/incidental_timezone/aliases @@ -2,3 +2,4 @@ destructive shippable/posix/incidental skip/aix skip/osx +skip/macos diff --git a/test/integration/targets/incidental_ufw/aliases b/test/integration/targets/incidental_ufw/aliases index 0013b22964a..7407abe60a4 100644 --- a/test/integration/targets/incidental_ufw/aliases +++ b/test/integration/targets/incidental_ufw/aliases @@ -2,6 +2,7 @@ shippable/posix/incidental skip/aix skip/power/centos skip/osx +skip/macos skip/freebsd skip/rhel8.0 skip/rhel8.0b diff --git a/test/integration/targets/incidental_zabbix_host/aliases b/test/integration/targets/incidental_zabbix_host/aliases index f89752b8331..212427eb969 100644 --- a/test/integration/targets/incidental_zabbix_host/aliases +++ b/test/integration/targets/incidental_zabbix_host/aliases @@ -2,5 +2,6 @@ destructive shippable/posix/incidental skip/aix skip/osx +skip/macos skip/freebsd skip/rhel diff --git a/test/integration/targets/module_no_log/aliases b/test/integration/targets/module_no_log/aliases index e0437b6c627..cbbb8804357 100644 --- a/test/integration/targets/module_no_log/aliases +++ b/test/integration/targets/module_no_log/aliases @@ -2,3 +2,4 @@ shippable/posix/group1 skip/aix # not configured to log user.info to /var/log/syslog 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 87bc587ad1c..05f65b7188f 100644 --- a/test/integration/targets/old_style_cache_plugins/aliases +++ b/test/integration/targets/old_style_cache_plugins/aliases @@ -1,3 +1,4 @@ shippable/posix/group3 skip/osx +skip/macos disabled diff --git a/test/integration/targets/package_facts/aliases b/test/integration/targets/package_facts/aliases index 25ddb5f8a84..6c62b9a752e 100644 --- a/test/integration/targets/package_facts/aliases +++ b/test/integration/targets/package_facts/aliases @@ -1,3 +1,4 @@ shippable/posix/group3 skip/aix skip/osx +skip/macos diff --git a/test/integration/targets/service/aliases b/test/integration/targets/service/aliases index a68be2b03b6..1ef4c3619a8 100644 --- a/test/integration/targets/service/aliases +++ b/test/integration/targets/service/aliases @@ -2,3 +2,4 @@ destructive shippable/posix/group1 skip/aix skip/osx +skip/macos diff --git a/test/integration/targets/service_facts/aliases b/test/integration/targets/service_facts/aliases index 330cb724adb..cc0aa0d99ad 100644 --- a/test/integration/targets/service_facts/aliases +++ b/test/integration/targets/service_facts/aliases @@ -2,3 +2,4 @@ shippable/posix/group3 skip/aix skip/freebsd skip/osx +skip/macos diff --git a/test/integration/targets/subversion/aliases b/test/integration/targets/subversion/aliases index d3e8e8020c5..1dd2724ef24 100644 --- a/test/integration/targets/subversion/aliases +++ b/test/integration/targets/subversion/aliases @@ -2,5 +2,6 @@ setup/always/setup_passlib shippable/posix/group2 skip/aix skip/osx +skip/macos destructive needs/root diff --git a/test/integration/targets/yum/aliases b/test/integration/targets/yum/aliases index e469a119718..5aba303dc9f 100644 --- a/test/integration/targets/yum/aliases +++ b/test/integration/targets/yum/aliases @@ -3,3 +3,4 @@ shippable/posix/group4 skip/aix skip/freebsd skip/osx +skip/macos diff --git a/test/utils/shippable/macos.sh b/test/utils/shippable/macos.sh new file mode 120000 index 00000000000..6ddb7768545 --- /dev/null +++ b/test/utils/shippable/macos.sh @@ -0,0 +1 @@ +remote.sh \ No newline at end of file