From 25b38d907e4452652ecf08e10665713182f763e9 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 29 Oct 2020 08:02:33 +0100 Subject: [PATCH] Disable docker tests (#1194) * Disable docker tests. ci_complete * Get rid of shippable groups 4 and 5. Redistribute the few remaining entries of group 4 to groups 1 to 3. ci_complete * Try group 1. --- shippable.yml | 70 ++++++++++--------- .../targets/connection_docker/aliases | 1 + tests/integration/targets/cronvar/aliases | 2 +- .../integration/targets/docker_config/aliases | 1 + .../targets/docker_container/aliases | 1 + .../targets/docker_container_info/aliases | 1 + .../integration/targets/docker_image/aliases | 1 + .../targets/docker_image_info/aliases | 1 + .../integration/targets/docker_login/aliases | 1 + .../targets/docker_network/aliases | 1 + .../targets/docker_network_info/aliases | 1 + tests/integration/targets/docker_node/aliases | 1 + .../targets/docker_node_info/aliases | 1 + .../integration/targets/docker_prune/aliases | 1 + .../integration/targets/docker_secret/aliases | 1 + .../integration/targets/docker_stack/aliases | 1 + .../targets/docker_stack_info/aliases | 1 + .../targets/docker_stack_task_info/aliases | 1 + .../integration/targets/docker_swarm/aliases | 2 +- .../targets/docker_swarm_info/aliases | 1 + .../targets/docker_swarm_service/aliases | 1 + .../targets/docker_swarm_service_info/aliases | 1 + .../integration/targets/docker_volume/aliases | 1 + .../targets/docker_volume_info/aliases | 1 + tests/integration/targets/dpkg_divert/aliases | 2 +- .../targets/inventory_docker_machine/aliases | 2 +- .../targets/inventory_docker_swarm/aliases | 1 + .../targets/iptables_state/aliases | 2 +- .../targets/lookup_passwordstore/aliases | 2 +- 29 files changed, 64 insertions(+), 40 deletions(-) diff --git a/shippable.yml b/shippable.yml index cfb7acb2ba..c6c9c0dc56 100644 --- a/shippable.yml +++ b/shippable.yml @@ -98,39 +98,41 @@ matrix: - env: T=devel/linux/ubuntu1604/3 - env: T=devel/linux/ubuntu1804/3 - #- env: T=devel/aix/7.2/4 - - env: T=devel/osx/10.11/4 - - env: T=devel/macos/10.15/4 - - env: T=devel/rhel/7.8/4 - - env: T=devel/rhel/8.2/4 - - env: T=devel/freebsd/11.1/4 - - env: T=devel/freebsd/12.1/4 - - env: T=devel/linux/centos6/4 - - env: T=devel/linux/centos7/4 - - env: T=devel/linux/centos8/4 - - env: T=devel/linux/fedora31/4 - - env: T=devel/linux/fedora32/4 - - env: T=devel/linux/opensuse15py2/4 - - env: T=devel/linux/opensuse15/4 - - env: T=devel/linux/ubuntu1604/4 - - env: T=devel/linux/ubuntu1804/4 + # group 4 is only used by docker and postgresql modules + ##- env: T=devel/aix/7.2/4 + #- env: T=devel/osx/10.11/4 + #- env: T=devel/macos/10.15/4 + #- env: T=devel/rhel/7.8/4 + #- env: T=devel/rhel/8.2/4 + #- env: T=devel/freebsd/11.1/4 + #- env: T=devel/freebsd/12.1/4 + #- env: T=devel/linux/centos6/4 + #- env: T=devel/linux/centos7/4 + #- env: T=devel/linux/centos8/4 + #- env: T=devel/linux/fedora31/4 + #- env: T=devel/linux/fedora32/4 + #- env: T=devel/linux/opensuse15py2/4 + #- env: T=devel/linux/opensuse15/4 + #- env: T=devel/linux/ubuntu1604/4 + #- env: T=devel/linux/ubuntu1804/4 - #- env: T=devel/aix/7.2/5 - - env: T=devel/osx/10.11/5 - - env: T=devel/macos/10.15/5 - - env: T=devel/rhel/7.8/5 - - env: T=devel/rhel/8.2/5 - - env: T=devel/freebsd/11.1/5 - - env: T=devel/freebsd/12.1/5 - - env: T=devel/linux/centos6/5 - - env: T=devel/linux/centos7/5 - - env: T=devel/linux/centos8/5 - - env: T=devel/linux/fedora31/5 - - env: T=devel/linux/fedora32/5 - - env: T=devel/linux/opensuse15py2/5 - - env: T=devel/linux/opensuse15/5 - - env: T=devel/linux/ubuntu1604/5 - - env: T=devel/linux/ubuntu1804/5 + # group 5 is only used by docker and postgresql modules + ##- env: T=devel/aix/7.2/5 + #- env: T=devel/osx/10.11/5 + #- env: T=devel/macos/10.15/5 + #- env: T=devel/rhel/7.8/5 + #- env: T=devel/rhel/8.2/5 + #- env: T=devel/freebsd/11.1/5 + #- env: T=devel/freebsd/12.1/5 + #- env: T=devel/linux/centos6/5 + #- env: T=devel/linux/centos7/5 + #- env: T=devel/linux/centos8/5 + #- env: T=devel/linux/fedora31/5 + #- env: T=devel/linux/fedora32/5 + #- env: T=devel/linux/opensuse15py2/5 + #- env: T=devel/linux/opensuse15/5 + #- env: T=devel/linux/ubuntu1604/5 + #- env: T=devel/linux/ubuntu1804/5 - env: T=devel/cloud/2.7/1 - env: T=devel/cloud/3.6/1 @@ -141,7 +143,7 @@ matrix: - env: T=2.10/linux/centos8/2 - env: T=2.10/linux/fedora32/3 - env: T=2.10/linux/opensuse15/3 - - env: T=2.10/linux/ubuntu1804/4 + #- env: T=2.10/linux/ubuntu1804/4 - env: T=2.10/cloud/3.6/1 #- env: T=2.9/osx/10.11/1 @@ -150,7 +152,7 @@ matrix: - env: T=2.9/linux/centos8/2 - env: T=2.9/linux/fedora31/3 - env: T=2.9/linux/opensuse15/3 - - env: T=2.9/linux/ubuntu1804/4 + #- env: T=2.9/linux/ubuntu1804/4 - env: T=2.9/cloud/3.6/1 branches: diff --git a/tests/integration/targets/connection_docker/aliases b/tests/integration/targets/connection_docker/aliases index 33b258daef..5ed34ffa91 100644 --- a/tests/integration/targets/connection_docker/aliases +++ b/tests/integration/targets/connection_docker/aliases @@ -1,2 +1,3 @@ +disabled # tests already running in community.docker non_local unsupported diff --git a/tests/integration/targets/cronvar/aliases b/tests/integration/targets/cronvar/aliases index b2033afd63..1c80472f94 100644 --- a/tests/integration/targets/cronvar/aliases +++ b/tests/integration/targets/cronvar/aliases @@ -1,5 +1,5 @@ destructive -shippable/posix/group4 +shippable/posix/group3 skip/aix skip/osx skip/macos diff --git a/tests/integration/targets/docker_config/aliases b/tests/integration/targets/docker_config/aliases index fadc88e265..edee2b1cee 100644 --- a/tests/integration/targets/docker_config/aliases +++ b/tests/integration/targets/docker_config/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group3 skip/osx skip/macos diff --git a/tests/integration/targets/docker_container/aliases b/tests/integration/targets/docker_container/aliases index aec97db2dc..ba1606d46f 100644 --- a/tests/integration/targets/docker_container/aliases +++ b/tests/integration/targets/docker_container/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group5 skip/osx skip/macos diff --git a/tests/integration/targets/docker_container_info/aliases b/tests/integration/targets/docker_container_info/aliases index 1ff45a2373..ff54a3bfd0 100644 --- a/tests/integration/targets/docker_container_info/aliases +++ b/tests/integration/targets/docker_container_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/osx skip/macos diff --git a/tests/integration/targets/docker_image/aliases b/tests/integration/targets/docker_image/aliases index 33b9cd9898..1fb9a5f2f8 100644 --- a/tests/integration/targets/docker_image/aliases +++ b/tests/integration/targets/docker_image/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group5 skip/aix skip/osx diff --git a/tests/integration/targets/docker_image_info/aliases b/tests/integration/targets/docker_image_info/aliases index f1162af547..b594fe3e84 100644 --- a/tests/integration/targets/docker_image_info/aliases +++ b/tests/integration/targets/docker_image_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_login/aliases b/tests/integration/targets/docker_login/aliases index 70d2451b99..0758b6bb35 100644 --- a/tests/integration/targets/docker_login/aliases +++ b/tests/integration/targets/docker_login/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group3 skip/aix skip/osx diff --git a/tests/integration/targets/docker_network/aliases b/tests/integration/targets/docker_network/aliases index 33b9cd9898..1fb9a5f2f8 100644 --- a/tests/integration/targets/docker_network/aliases +++ b/tests/integration/targets/docker_network/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group5 skip/aix skip/osx diff --git a/tests/integration/targets/docker_network_info/aliases b/tests/integration/targets/docker_network_info/aliases index f1162af547..b594fe3e84 100644 --- a/tests/integration/targets/docker_network_info/aliases +++ b/tests/integration/targets/docker_network_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_node/aliases b/tests/integration/targets/docker_node/aliases index 78341e0715..e606476524 100644 --- a/tests/integration/targets/docker_node/aliases +++ b/tests/integration/targets/docker_node/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_node_info/aliases b/tests/integration/targets/docker_node_info/aliases index 5c691cdfe5..2095f4690a 100644 --- a/tests/integration/targets/docker_node_info/aliases +++ b/tests/integration/targets/docker_node_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group3 skip/aix skip/osx diff --git a/tests/integration/targets/docker_prune/aliases b/tests/integration/targets/docker_prune/aliases index f1162af547..b594fe3e84 100644 --- a/tests/integration/targets/docker_prune/aliases +++ b/tests/integration/targets/docker_prune/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_secret/aliases b/tests/integration/targets/docker_secret/aliases index 1bb02f663f..064bd0e9db 100644 --- a/tests/integration/targets/docker_secret/aliases +++ b/tests/integration/targets/docker_secret/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_stack/aliases b/tests/integration/targets/docker_stack/aliases index 1bb02f663f..064bd0e9db 100644 --- a/tests/integration/targets/docker_stack/aliases +++ b/tests/integration/targets/docker_stack/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_stack_info/aliases b/tests/integration/targets/docker_stack_info/aliases index 46d1424a21..1c3a812168 100644 --- a/tests/integration/targets/docker_stack_info/aliases +++ b/tests/integration/targets/docker_stack_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group1 skip/aix skip/osx diff --git a/tests/integration/targets/docker_stack_task_info/aliases b/tests/integration/targets/docker_stack_task_info/aliases index 46d1424a21..1c3a812168 100644 --- a/tests/integration/targets/docker_stack_task_info/aliases +++ b/tests/integration/targets/docker_stack_task_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group1 skip/aix skip/osx diff --git a/tests/integration/targets/docker_swarm/aliases b/tests/integration/targets/docker_swarm/aliases index b06411b2f8..b693c7f763 100644 --- a/tests/integration/targets/docker_swarm/aliases +++ b/tests/integration/targets/docker_swarm/aliases @@ -1,5 +1,5 @@ shippable/posix/group2 -disabled # See: https://github.com/ansible/ansible/issues/61815 +disabled # tests already running in community.docker; also, see: https://github.com/ansible/ansible/issues/61815 skip/aix skip/osx skip/macos diff --git a/tests/integration/targets/docker_swarm_info/aliases b/tests/integration/targets/docker_swarm_info/aliases index 46d1424a21..1c3a812168 100644 --- a/tests/integration/targets/docker_swarm_info/aliases +++ b/tests/integration/targets/docker_swarm_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group1 skip/aix skip/osx diff --git a/tests/integration/targets/docker_swarm_service/aliases b/tests/integration/targets/docker_swarm_service/aliases index c37e2707c0..ef5bc7093c 100644 --- a/tests/integration/targets/docker_swarm_service/aliases +++ b/tests/integration/targets/docker_swarm_service/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group5 skip/aix skip/osx diff --git a/tests/integration/targets/docker_swarm_service_info/aliases b/tests/integration/targets/docker_swarm_service_info/aliases index 5c691cdfe5..2095f4690a 100644 --- a/tests/integration/targets/docker_swarm_service_info/aliases +++ b/tests/integration/targets/docker_swarm_service_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group3 skip/aix skip/osx diff --git a/tests/integration/targets/docker_volume/aliases b/tests/integration/targets/docker_volume/aliases index f1162af547..b594fe3e84 100644 --- a/tests/integration/targets/docker_volume/aliases +++ b/tests/integration/targets/docker_volume/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/docker_volume_info/aliases b/tests/integration/targets/docker_volume_info/aliases index e91c4ea415..5aca36be4b 100644 --- a/tests/integration/targets/docker_volume_info/aliases +++ b/tests/integration/targets/docker_volume_info/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group1 skip/aix skip/osx diff --git a/tests/integration/targets/dpkg_divert/aliases b/tests/integration/targets/dpkg_divert/aliases index b47e4a6054..6ab0a081c8 100644 --- a/tests/integration/targets/dpkg_divert/aliases +++ b/tests/integration/targets/dpkg_divert/aliases @@ -1,4 +1,4 @@ -shippable/posix/group4 +shippable/posix/group1 skip/aix skip/osx skip/macos diff --git a/tests/integration/targets/inventory_docker_machine/aliases b/tests/integration/targets/inventory_docker_machine/aliases index 7ed38ca390..9e33cbf928 100644 --- a/tests/integration/targets/inventory_docker_machine/aliases +++ b/tests/integration/targets/inventory_docker_machine/aliases @@ -1,4 +1,4 @@ -disabled +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/inventory_docker_swarm/aliases b/tests/integration/targets/inventory_docker_swarm/aliases index 78341e0715..e606476524 100644 --- a/tests/integration/targets/inventory_docker_swarm/aliases +++ b/tests/integration/targets/inventory_docker_swarm/aliases @@ -1,3 +1,4 @@ +disabled # tests already running in community.docker shippable/posix/group2 skip/aix skip/osx diff --git a/tests/integration/targets/iptables_state/aliases b/tests/integration/targets/iptables_state/aliases index 741b98f710..3cac4af522 100644 --- a/tests/integration/targets/iptables_state/aliases +++ b/tests/integration/targets/iptables_state/aliases @@ -1,5 +1,5 @@ destructive -shippable/posix/group4 +shippable/posix/group1 skip/docker # kernel modules not loadable skip/freebsd # no iptables/netfilter (Linux specific) skip/osx # no iptables/netfilter (Linux specific) diff --git a/tests/integration/targets/lookup_passwordstore/aliases b/tests/integration/targets/lookup_passwordstore/aliases index 1c21d9b739..8b108917a0 100644 --- a/tests/integration/targets/lookup_passwordstore/aliases +++ b/tests/integration/targets/lookup_passwordstore/aliases @@ -1,4 +1,4 @@ -shippable/posix/group4 +shippable/posix/group1 destructive skip/aix skip/rhel