From 765f31a673709f74e468cf22ce3fc323bf5ae758 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 30 Sep 2020 14:00:05 +0200 Subject: [PATCH] Run tests with macOS 10.15. (#971) * Run tests with macOS 10.15. * Restrict to macOS CI runs for now until they pass. * Skip tests on macOS that are skipped on OSX. * Disable consul test for macOS. * Disable chroot connection tests for macOS. * Add setup_gnutar role from https://github.com/ansible/ansible/pull/71841. * Use setup_gnutar for yarn and npm tests. * Revert "Restrict to macOS CI runs for now until they pass." This reverts commit d945d0399f1727a5fe5942089c74d6662bd2b045. * hashi_vault lookup tests seem to be always unstable, disabling for now. * Use homebrew module instead of command. --- tests/integration/targets/docker_config/aliases | 1 + tests/integration/targets/docker_container/aliases | 1 + tests/integration/targets/docker_container_info/aliases | 1 + tests/integration/targets/docker_host_info/aliases | 1 + tests/integration/targets/docker_image/aliases | 1 + tests/integration/targets/docker_image_info/aliases | 1 + tests/integration/targets/docker_login/aliases | 1 + tests/integration/targets/docker_network/aliases | 1 + tests/integration/targets/docker_network_info/aliases | 1 + tests/integration/targets/docker_node/aliases | 1 + tests/integration/targets/docker_node_info/aliases | 1 + tests/integration/targets/docker_prune/aliases | 1 + tests/integration/targets/docker_secret/aliases | 1 + tests/integration/targets/docker_stack/aliases | 1 + tests/integration/targets/docker_stack_info/aliases | 1 + tests/integration/targets/docker_stack_task_info/aliases | 1 + tests/integration/targets/docker_swarm/aliases | 1 + tests/integration/targets/docker_swarm_info/aliases | 1 + tests/integration/targets/docker_swarm_service/aliases | 1 + tests/integration/targets/docker_swarm_service_info/aliases | 1 + tests/integration/targets/docker_volume/aliases | 1 + tests/integration/targets/docker_volume_info/aliases | 1 + tests/integration/targets/inventory_docker_machine/aliases | 1 + tests/integration/targets/inventory_docker_swarm/aliases | 1 + 24 files changed, 24 insertions(+) diff --git a/tests/integration/targets/docker_config/aliases b/tests/integration/targets/docker_config/aliases index f1e3dd86..fadc88e2 100644 --- a/tests/integration/targets/docker_config/aliases +++ b/tests/integration/targets/docker_config/aliases @@ -1,5 +1,6 @@ shippable/posix/group3 skip/osx +skip/macos skip/freebsd skip/aix destructive diff --git a/tests/integration/targets/docker_container/aliases b/tests/integration/targets/docker_container/aliases index f5bf9f10..aec97db2 100644 --- a/tests/integration/targets/docker_container/aliases +++ b/tests/integration/targets/docker_container/aliases @@ -1,5 +1,6 @@ shippable/posix/group5 skip/osx +skip/macos skip/freebsd skip/aix destructive diff --git a/tests/integration/targets/docker_container_info/aliases b/tests/integration/targets/docker_container_info/aliases index dfa15ee8..1ff45a23 100644 --- a/tests/integration/targets/docker_container_info/aliases +++ b/tests/integration/targets/docker_container_info/aliases @@ -1,5 +1,6 @@ shippable/posix/group2 skip/osx +skip/macos skip/freebsd skip/aix destructive diff --git a/tests/integration/targets/docker_host_info/aliases b/tests/integration/targets/docker_host_info/aliases index 7a020910..f1162af5 100644 --- a/tests/integration/targets/docker_host_info/aliases +++ b/tests/integration/targets/docker_host_info/aliases @@ -1,5 +1,6 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_image/aliases b/tests/integration/targets/docker_image/aliases index 1187e123..33b9cd98 100644 --- a/tests/integration/targets/docker_image/aliases +++ b/tests/integration/targets/docker_image/aliases @@ -1,5 +1,6 @@ shippable/posix/group5 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_image_info/aliases b/tests/integration/targets/docker_image_info/aliases index 7a020910..f1162af5 100644 --- a/tests/integration/targets/docker_image_info/aliases +++ b/tests/integration/targets/docker_image_info/aliases @@ -1,5 +1,6 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_login/aliases b/tests/integration/targets/docker_login/aliases index 137b8280..70d2451b 100644 --- a/tests/integration/targets/docker_login/aliases +++ b/tests/integration/targets/docker_login/aliases @@ -1,5 +1,6 @@ shippable/posix/group3 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_network/aliases b/tests/integration/targets/docker_network/aliases index 1187e123..33b9cd98 100644 --- a/tests/integration/targets/docker_network/aliases +++ b/tests/integration/targets/docker_network/aliases @@ -1,5 +1,6 @@ shippable/posix/group5 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_network_info/aliases b/tests/integration/targets/docker_network_info/aliases index 7a020910..f1162af5 100644 --- a/tests/integration/targets/docker_network_info/aliases +++ b/tests/integration/targets/docker_network_info/aliases @@ -1,5 +1,6 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_node/aliases b/tests/integration/targets/docker_node/aliases index ed231329..78341e07 100644 --- a/tests/integration/targets/docker_node/aliases +++ b/tests/integration/targets/docker_node/aliases @@ -1,6 +1,7 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_node_info/aliases b/tests/integration/targets/docker_node_info/aliases index 9fe8a6d6..5c691cdf 100644 --- a/tests/integration/targets/docker_node_info/aliases +++ b/tests/integration/targets/docker_node_info/aliases @@ -1,6 +1,7 @@ shippable/posix/group3 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_prune/aliases b/tests/integration/targets/docker_prune/aliases index 7a020910..f1162af5 100644 --- a/tests/integration/targets/docker_prune/aliases +++ b/tests/integration/targets/docker_prune/aliases @@ -1,5 +1,6 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_secret/aliases b/tests/integration/targets/docker_secret/aliases index af1a7950..1bb02f66 100644 --- a/tests/integration/targets/docker_secret/aliases +++ b/tests/integration/targets/docker_secret/aliases @@ -1,6 +1,7 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_stack/aliases b/tests/integration/targets/docker_stack/aliases index af1a7950..1bb02f66 100644 --- a/tests/integration/targets/docker_stack/aliases +++ b/tests/integration/targets/docker_stack/aliases @@ -1,6 +1,7 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_stack_info/aliases b/tests/integration/targets/docker_stack_info/aliases index 620dd25f..46d1424a 100644 --- a/tests/integration/targets/docker_stack_info/aliases +++ b/tests/integration/targets/docker_stack_info/aliases @@ -1,6 +1,7 @@ shippable/posix/group1 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_stack_task_info/aliases b/tests/integration/targets/docker_stack_task_info/aliases index 620dd25f..46d1424a 100644 --- a/tests/integration/targets/docker_stack_task_info/aliases +++ b/tests/integration/targets/docker_stack_task_info/aliases @@ -1,6 +1,7 @@ shippable/posix/group1 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_swarm/aliases b/tests/integration/targets/docker_swarm/aliases index 917268c2..b06411b2 100644 --- a/tests/integration/targets/docker_swarm/aliases +++ b/tests/integration/targets/docker_swarm/aliases @@ -2,6 +2,7 @@ shippable/posix/group2 disabled # See: https://github.com/ansible/ansible/issues/61815 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_swarm_info/aliases b/tests/integration/targets/docker_swarm_info/aliases index 620dd25f..46d1424a 100644 --- a/tests/integration/targets/docker_swarm_info/aliases +++ b/tests/integration/targets/docker_swarm_info/aliases @@ -1,6 +1,7 @@ shippable/posix/group1 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_swarm_service/aliases b/tests/integration/targets/docker_swarm_service/aliases index a9e65818..c37e2707 100644 --- a/tests/integration/targets/docker_swarm_service/aliases +++ b/tests/integration/targets/docker_swarm_service/aliases @@ -1,6 +1,7 @@ shippable/posix/group5 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_swarm_service_info/aliases b/tests/integration/targets/docker_swarm_service_info/aliases index 9fe8a6d6..5c691cdf 100644 --- a/tests/integration/targets/docker_swarm_service_info/aliases +++ b/tests/integration/targets/docker_swarm_service_info/aliases @@ -1,6 +1,7 @@ shippable/posix/group3 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence, diff --git a/tests/integration/targets/docker_volume/aliases b/tests/integration/targets/docker_volume/aliases index 7a020910..f1162af5 100644 --- a/tests/integration/targets/docker_volume/aliases +++ b/tests/integration/targets/docker_volume/aliases @@ -1,5 +1,6 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/docker_volume_info/aliases b/tests/integration/targets/docker_volume_info/aliases index e0fa6d19..e91c4ea4 100644 --- a/tests/integration/targets/docker_volume_info/aliases +++ b/tests/integration/targets/docker_volume_info/aliases @@ -1,5 +1,6 @@ shippable/posix/group1 skip/aix skip/osx +skip/macos skip/freebsd destructive diff --git a/tests/integration/targets/inventory_docker_machine/aliases b/tests/integration/targets/inventory_docker_machine/aliases index 9928ea3e..7ed38ca3 100644 --- a/tests/integration/targets/inventory_docker_machine/aliases +++ b/tests/integration/targets/inventory_docker_machine/aliases @@ -2,6 +2,7 @@ disabled shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # We need SSH access to the VM and need to be able to let diff --git a/tests/integration/targets/inventory_docker_swarm/aliases b/tests/integration/targets/inventory_docker_swarm/aliases index ed231329..78341e07 100644 --- a/tests/integration/targets/inventory_docker_swarm/aliases +++ b/tests/integration/targets/inventory_docker_swarm/aliases @@ -1,6 +1,7 @@ shippable/posix/group2 skip/aix skip/osx +skip/macos skip/freebsd destructive skip/docker # The tests sometimes make docker daemon unstable; hence,